Add upgrade to queens trigger after deploy pike
Related-Prod: PROD-36426
Change-Id: Ie24c27c772b5290dfbd66482d0c340625ce3b629
diff --git a/jobs/pipelines/deploy-cicd-and-run-tests.groovy b/jobs/pipelines/deploy-cicd-and-run-tests.groovy
index 3c0b328..c01a820 100644
--- a/jobs/pipelines/deploy-cicd-and-run-tests.groovy
+++ b/jobs/pipelines/deploy-cicd-and-run-tests.groovy
@@ -222,6 +222,20 @@
} // node
}
}
+ //run upgrade pike to queens only for pike proposed
+ if (env.AUTO_UPGRADE_TO_QUEENS == "true" && currentBuild.result == 'SUCCESS') {
+ def deploy = build job: "os-update-pike-to-queens",
+ parameters: [
+ string(name: 'PARENT_NODE_NAME', value: "openstack_slave_${env.ENV_NAME}"),
+ string(name: 'TCP_QA_REFS', value: env.TCP_QA_REFS),
+ string(name: 'PASSED_STEPS', value: steps),
+ string(name: 'TEMPEST_TEST_SUITE_NAME', value: env.TEMPEST_TEST_SUITE_NAME),
+ string(name: 'NODE', value: "openstack_slave_${env.ENV_NAME}"),
+ string(name: 'RUN_TEST_OPTS', value: '-k TestUpdatePikeToQueens')
+ ],
+ wait: false,
+ propagate: false
+ }
//run upgrade env to proposed
if (env.RUN_UPGRADE_AFTER_JOB == "true" && currentBuild.result == 'SUCCESS') {
network_backend = env.PLATFORM_STACK_INSTALL.contains("contrail") ? 'contrail' : 'dvr'
diff --git a/jobs/templates/heat-cicd-pike-dvr-sl.yml b/jobs/templates/heat-cicd-pike-dvr-sl.yml
index 04a28b7..3c1fd06 100644
--- a/jobs/templates/heat-cicd-pike-dvr-sl.yml
+++ b/jobs/templates/heat-cicd-pike-dvr-sl.yml
@@ -210,6 +210,10 @@
default: true
description: 'Works starting from MCP 2019.2.10 or master. Whether to apply saltstack updates on all nodes in cluster before deployment'
name: UPGRADE_SALTSTACK
+ - bool:
+ default: false
+ description: 'Run upgrade pike_to_queens job after deploy and tests'
+ name: AUTO_UPGRADE_TO_QUEENS
- text:
default: ''
description: |-