commit aeb3bc2267e0c36b49238933c3e5dbd35d745d01
author mcp-jenkins <mcp-jenkins@mirantis.com> Fri Nov 08 09:17:28 2019 +0000
committer Gerrit Code Review <mail@domain.com> Fri Nov 08 09:17:28 2019 +0000
tree 0523a6dc6875393d7d24286c6fd74686e6943063
parent d13c1529ec2f31e29144a1359c322dede596fde5
parent dfc636490ca60cbabdf77f71b882f8c2bbe0aebe

Merge "Fix dogtag post restore steps pipeline"

cloud-deploy-pipeline.groovy

diff --git a/cloud-deploy-pipeline.groovy b/cloud-deploy-pipeline.groovy
index d5b991c..bfed52d 100644
--- a/cloud-deploy-pipeline.groovy
+++ b/cloud-deploy-pipeline.groovy
@@ -381,7 +381,8 @@
 
             stage('Install infra') {
                 if (common.checkContains('STACK_INSTALL', 'core') ||
-                    common.checkContains('STACK_INSTALL', 'openstack')) {
+                    common.checkContains('STACK_INSTALL', 'openstack') ||
+                    common.checkContains('STACK_INSTALL', 'cicd')) {
                         orchestrate.installInfra(venvPepper, extra_tgt)
                 }
             }
@@ -573,7 +574,6 @@
                 stage('Install Cicd') {
                     extra_tgt_bckp = extra_tgt
                     extra_tgt = 'and I@_param:drivetrain_role:cicd ' + extra_tgt_bckp
-                    orchestrate.installInfra(venvPepper, extra_tgt)
                     orchestrate.installCicd(venvPepper, extra_tgt)
                     extra_tgt = extra_tgt_bckp
                 }