Fix logic of the upgrade parameter
- RUN_UPGRADE_AFTER_JOB is true without parameters
Related-Prod: PROD-36426
Change-Id: If5aaf975a9a51014151711144bbd5da786edd8f8
diff --git a/jobs/pipelines/deploy-cicd-and-run-tests.groovy b/jobs/pipelines/deploy-cicd-and-run-tests.groovy
index 5a84c60..463bc24 100644
--- a/jobs/pipelines/deploy-cicd-and-run-tests.groovy
+++ b/jobs/pipelines/deploy-cicd-and-run-tests.groovy
@@ -11,7 +11,6 @@
def batch_size = env.BATCH_SIZE ?: ''
def dist_upgrade_nodes = "${env.DIST_UPGRADE_NODES}" != "false" ? true : false
def upgrade_saltstack = "${env.UPGRADE_SALTSTACK}" != "false" ? true : false
-def run_upgrade_after_job = "${env.RUN_UPGRADE_AFTER_JOB}" != "false" ? true : false
if (env_manager == 'devops') {
jenkins_slave_node_name = "${NODE_NAME}"
@@ -150,7 +149,7 @@
// run test stages
test(shared, common, steps, env_manager)
//run upgrade env to proposed
- if (run_upgrade_after_job) {
+ if (env.RUN_UPGRADE_AFTER_JOB == "true") {
network_backend = env.PLATFORM_STACK_INSTALL.contains("contrail") ? 'contrail' : 'dvr'
upgrade_job = "mcp-update-${env.TEMPEST_IMAGE_VERSION}-${network_backend}-sl"
def deploy = build job: "${upgrade_job}",