Remove unnecessary steps from kdt deployment
After dependent patch kube-addons will be installed even if opencontrail not enabled
InstallInfra not needed on stage 'Install Cicd on kdt'
since it is executed on InstallInfra stage
Depends on: http://gerrit.mcp.mirantis.com/39363
Prod related: PROD-29333
Change-Id: Ia3417b77e11a961179b68ecc0cd5643da5332095
diff --git a/cloud-deploy-pipeline.groovy b/cloud-deploy-pipeline.groovy
index de8d8fd..d59f313 100644
--- a/cloud-deploy-pipeline.groovy
+++ b/cloud-deploy-pipeline.groovy
@@ -467,7 +467,6 @@
}
stage('Install Kubernetes control for kdt') {
- salt.enforceStateWithTest([saltId: venvPepper, target: "I@kubernetes:master ${extra_tgt}", state: 'kubernetes.master.kube-addons'])
salt.enforceStateWithTest([saltId: venvPepper, target: "I@kubernetes:master ${extra_tgt}", state: 'kubernetes.pool.images'])
orchestrate.installKubernetesControl(venvPepper, extra_tgt)
@@ -572,7 +571,6 @@
stage('Install Cicd on kdt') {
extra_tgt_bckp = extra_tgt
extra_tgt = 'and kdt* ' + extra_tgt_bckp
- orchestrate.installInfra(venvPepper, extra_tgt)
orchestrate.installCicd(venvPepper, extra_tgt)
extra_tgt = extra_tgt_bckp
}