commit 9b7f097597b8872671b69eeda3d35d9d7ac31724
author Denis Egorenko <degorenko@mirantis.com> Thu Nov 07 20:42:43 2019 +0400
committer Denis Egorenko <degorenko@mirantis.com> Thu Nov 07 20:42:43 2019 +0400
tree dfa69e0e1d4e4e7d41d82064800e91c6e2163315
parent 9056c6227ecb7119513ad93ee64888740b36ea61

Drop installInfra step on cicd stage

It is already executed on Infra stage at the begining of deployment.
Extra step leads to mine flush on some nodes after OpenStack is deployed
so for example Barbican/Dogtag services affected.

Change-Id: Icaa4b437d17ed79e3e3df52343848f4e841a5d87
Related-Prod: PROD-33911
Related-Prod: PROD-33909
(cherry-picked from commit d13c1529ec2f31e29144a1359c322dede596fde5)

cloud-deploy-pipeline.groovy

diff --git a/cloud-deploy-pipeline.groovy b/cloud-deploy-pipeline.groovy
index 5f19480..1471acf 100644
--- a/cloud-deploy-pipeline.groovy
+++ b/cloud-deploy-pipeline.groovy
@@ -368,7 +368,8 @@
             stage('Install infra') {
               if (common.checkContains('STACK_INSTALL', 'core') ||
                     common.checkContains('STACK_INSTALL', 'openstack') ||
-                      common.checkContains('STACK_INSTALL', 'oss')) {
+                      common.checkContains('STACK_INSTALL', 'oss') ||
+                        common.checkContains('STACK_INSTALL', 'cicd')) {
                   orchestrate.installInfra(venvPepper, extra_tgt)
               }
             }
@@ -534,7 +535,6 @@
 
             if (common.checkContains('STACK_INSTALL', 'cicd')) {
                 stage('Install Cicd') {
-                    orchestrate.installInfra(venvPepper, extra_tgt)
                     orchestrate.installCicd(venvPepper, extra_tgt)
                 }
             }