Change upgrade to release method
-deleted upgrade part for release deploy
-added new cron timers for release
-added upgrade after deploy with other jobs
Related-Prod: PROD-36426
Change-Id: I0ff8339d748788f4cd571eae5e4ba9674de30690
diff --git a/jobs/templates/released-heat-cicd-queens-contrail41-sl.yml b/jobs/templates/released-heat-cicd-queens-contrail41-sl.yml
index 585b2c9..f302f90 100644
--- a/jobs/templates/released-heat-cicd-queens-contrail41-sl.yml
+++ b/jobs/templates/released-heat-cicd-queens-contrail41-sl.yml
@@ -98,19 +98,8 @@
--keep-duplicates --maxfail=1 \
tcp_tests/tests/system/test_cvp_pipelines.py::TestCvpPipelines::test_run_cvp_tempest \
tcp_tests/tests/system/test_cvp_pipelines.py::TestCvpPipelines::test_run_cvp_func_sanity \
- tcp_tests/tests/system/test_cvp_pipelines.py::TestCvpPipelines::test_run_cvp_stacklight \
- \
- tcp_tests/tests/system/test_mcp_update.py::TestUpdateMcpCluster::test_update_drivetrain \
- tcp_tests/tests/system/test_upgrade_contrail.py::TestUpdateContrail \
- tcp_tests/tests/system/test_mcp_update.py::TestOpenstackUpdate \
- tcp_tests/tests/system/test_mcp_update.py::TestUpdateMcpCluster::test_update_galera \
- tcp_tests/tests/system/test_mcp_update.py::TestUpdateMcpCluster::test_update_rabbit \
- tcp_tests/tests/system/test_mcp_update.py::TestUpdateMcpCluster::test_update_stacklight \
- tcp_tests/tests/system/test_mcp_update.py::TestUpdateMcpCluster::test_update_ceph \
- \
- tcp_tests/tests/system/test_cvp_pipelines.py::TestCvpPipelines::test_run_cvp_tempest \
- tcp_tests/tests/system/test_cvp_pipelines.py::TestCvpPipelines::test_run_cvp_func_sanity \
tcp_tests/tests/system/test_cvp_pipelines.py::TestCvpPipelines::test_run_cvp_stacklight
+
description: |-
Pytest option -k or -m, with expression to select necessary tests.
Additional pytest options are allowed.
@@ -222,6 +211,10 @@
default: false
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:
+ name: RUN_UPGRADE_AFTER_JOB
+ default: true
+ description: "Upgrade and test after deploy?"
pipeline-scm:
lightweight-checkout: false
scm:
@@ -231,4 +224,12 @@
refspec: ${{TCP_QA_REFS}}
url: https://gerrit.mcp.mirantis.com/mcp/tcp-qa
script-path: jobs/pipelines/deploy-cicd-and-run-tests.groovy
-
+ publishers:
+ - conditional-publisher:
+ - condition-kind: boolean-expression
+ condition-expression: $RUN_UPGRADE_AFTER_JOB
+ action:
+ - trigger-parameterized-builds:
+ - project: 'mcp-update-queens-contrail-sl'
+ condition: SUCCESS
+ trigger-with-no-params: true