Merge branch 'master' of git.quantgroup.cn:QA/global-jenkinsfile

vars/qgAnsiblePipeline.groovy

@@ -25,7 +25,7 @@ def call(body) {
         
         stage('Build') {
             if (action == 'deploy') {
-            	sh "ansible-playbook /etc/ansible/build.yml -e project_name=${envType}.${projectName} -e name_with_namespace=${nameWithNamespace} -e tag_name=${tagName} -e force=${force} -vv"
+            	sh "ansible-playbook /etc/ansible/build.yml -e project_name=${envType}.${projectName} -e name_with_namespace=${nameWithNamespace} -e tag_name=${tagName} -e force=${force} -e env=${envType} -vv"
 	    }
         }
 
@@ -47,7 +47,7 @@ def call(body) {
             }
 
             if (action == 'rollback') {
-                sh "ansible-playbook /etc/ansible/${action}.yml -e project_name=${envType}.${projectName}  -e data_center=${dataCenter} -e machines=${machine[0]} -e rollback_to_release=${tag_name} -e force=${force} -vv"
+                sh "ansible-playbook /etc/ansible/${action}.yml -e project_name=${envType}.${projectName}  -e data_center=${dataCenter} -e machines=${machines} -e rollback_to_release=${tag_name} -e force=${force} -vv"
             }
         }
     }