带分支

src/org/qg/StageBucket.groovy

@@ -55,8 +55,10 @@ def copy_files_java(systemName, contextDir) {
 	    sh "cp ${jar_path} ${contextDir}/"
 }
 
-def build_nodejs_and_ui(namespace, systemName, contextDir) {
-    sh "ansible-playbook /etc/ansible/build.yml -e prefix=${namespace} -e project_name=pre.${systemName} -e workspace=${contextDir} -vv"
+def build_nodejs_and_ui(namespace, systemName, contextDir, repoName, branchName) {
+    sh "ansible-playbook /etc/ansible/deploy.yml -e project_name=pre.${systemName} -e repo_name=${repoName} -e branch_name=${branchName} -vv"
+    /*sh "ansible-playbook /etc/ansible/build.yml -e prefix=${namespace} -e project_name=pre.${systemName} -e workspace=${contextDir} -vv"*/
+    
 }
 
 def build_python(namespace, systemName, contextDir) {

vars/qgDockerPipeline.groovy

@@ -62,10 +62,10 @@ def call(body) {
                         _stage.build_java(namespace, systemName, contextDir)
                         break
                     case "ui":
-                        _stage.build_nodejs_and_ui(namespace, systemName, contextDir)
+                        _stage.build_nodejs_and_ui(namespace, systemName, contextDir, gitRepo, branchName)
                         break                        
                     case  "nodejs":
-                        _stage.build_nodejs_and_ui(namespace, systemName, contextDir)
+                        _stage.build_nodejs_and_ui(namespace, systemName, contextDir, gitRepo, branchName)
                         break
                     case "python":
                         _stage.build_python(namespace, systemName, contextDir)