commit 3bb7b5b8439c4e8b91f348beda28da88d49c839d
author mcp-jenkins <mcp-jenkins@mirantis.com> Fri Nov 08 09:17:26 2019 +0000
committer Gerrit Code Review <mail@domain.com> Fri Nov 08 09:17:26 2019 +0000
tree 4b264d64a653d50cf093824937d5c3f069f883ef
parent 9b7f097597b8872671b69eeda3d35d9d7ac31724
parent b97ba47f8de9205a5e240ce47d1621c7397331b5

Merge "Fix dogtag post restore steps pipeline" into release/proposed/2019.2.0

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)
                 }
             }