Update Jenkins_244u176

stable version

Author: Aiden-zht

Jenkins_244u176

@@ -18,9 +18,7 @@ pipeline {
             }
         }
         stage('docker build') {
-            when {
-                anyOf { branch 'develop'; branch 'main' }
-            }
+            
 
             agent {
                 node {
@@ -45,9 +43,7 @@ pipeline {
 
         }
         stage('Pull and Tag Images') {
-            when {
-                anyOf { branch 'develop'; branch 'main' }
-            }
+           
 
             agent {
                 node {
@@ -62,9 +58,7 @@ pipeline {
 
         }
         stage('Deploy to test'){
-            when {
-                branch 'main'
-            }
+            
             parallel {
 
 
@@ -78,11 +72,11 @@ pipeline {
 
                     steps {
                         echo "pull dingo-command images to test on second node"
-                        // dir('/home/cicd/kolla-ansible/tools') {
-                        //     sh 'ansible-playbook -e @/home/cicd/envs/functional_test_env/globals.yml -e @/home/cicd/envs/functional_test_env/passwords.yml --tags dingo-command -e openstack_tag=${IMAGE_TAG} -e CONFIG_DIR=/home/cicd/envs/functional_test_env -e kolla_action=pull ../ansible/site.yml  --inventory /home/cicd/envs/functional_test_env/multinode -e docker_namespace=openstack -e docker_registry=harbor.zetyun.cn'
-                        //     echo 'deploy images to develop on second node'
-                        //     sh 'ansible-playbook -e @/home/cicd/envs/functional_test_env/globals.yml -e @/home/cicd/envs/functional_test_env/passwords.yml --tags dingo-command -e openstack_tag=${IMAGE_TAG} -e CONFIG_DIR=/home/cicd/envs/functional_test_env -e kolla_action=upgrade ../ansible/site.yml  --inventory /home/cicd/envs/functional_test_env/multinode -e docker_namespace=openstack -e docker_registry=harbor.zetyun.cn'
-                        // }
+                        dir('/home/cicd/kolla-ansible/tools') {
+                             sh 'ansible-playbook -e @/home/cicd/envs/functional_test_env/globals.yml -e @/home/cicd/envs/functional_test_env/passwords.yml --tags dingo-command -e openstack_tag=${IMAGE_TAG} -e CONFIG_DIR=/home/cicd/envs/functional_test_env -e kolla_action=pull ../ansible/site.yml  --inventory /home/cicd/envs/functional_test_env/multinode -e docker_namespace=openstack -e docker_registry=harbor.zetyun.cn'
+                             echo 'deploy images to develop on second node'
+                             sh 'ansible-playbook -e @/home/cicd/envs/functional_test_env/globals.yml -e @/home/cicd/envs/functional_test_env/passwords.yml --tags dingo-command -e openstack_tag=${IMAGE_TAG} -e CONFIG_DIR=/home/cicd/envs/functional_test_env -e kolla_action=upgrade ../ansible/site.yml  --inventory /home/cicd/envs/functional_test_env/multinode -e docker_namespace=openstack -e docker_registry=harbor.zetyun.cn'
+                         }
                     }
                 }
             }