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/project.yaml b/jobs/project.yaml
index cfe8f2a..ce578e1 100644
--- a/jobs/project.yaml
+++ b/jobs/project.yaml
@@ -5,13 +5,13 @@
jobs:
- heat-cicd-pike-dvr-sl:
disabled: '{disabled-proposed}'
- trigger_time: H(5-30) 22 * * 1-7
+ trigger_time: H(5-30) 22 * * 1-5
- heat-cicd-queens-contrail41-sl:
disabled: '{disabled-proposed}'
- trigger_time: H(5-30) 23 * * 1-7
+ trigger_time: H(5-30) 23 * * 1-5
- heat-cicd-queens-dvr-sl:
disabled: '{disabled-proposed}'
- trigger_time: H(5-30) 21 * * 1-7
+ trigger_time: H(5-30) 21 * * 1-5
# ------- BM jobs -------
- deploy_bm:
disabled: false
@@ -26,7 +26,7 @@
# --- Released envs ------
- deploy-released:
disabled: false
- trigger_time: 0 18 * * 0-4
+ trigger_time: H(5-30) 18 * * 6
- released-heat-cicd-pike-dvr-sl
- released-heat-cicd-pike-contrail41-sl
- released-heat-cicd-queens-dvr-sl
diff --git a/jobs/templates/released-heat-cicd-pike-contrail41-sl.yml b/jobs/templates/released-heat-cicd-pike-contrail41-sl.yml
index fbd19fd..87141ea 100644
--- a/jobs/templates/released-heat-cicd-pike-contrail41-sl.yml
+++ b/jobs/templates/released-heat-cicd-pike-contrail41-sl.yml
@@ -100,18 +100,6 @@
--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: |-
@@ -220,6 +208,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:
+ name: RUN_UPGRADE_AFTER_JOB
+ default: true
+ description: "Upgrade and test after deploy?"
pipeline-scm:
lightweight-checkout: false
scm:
@@ -229,4 +221,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-pike-contrail-sl'
+ condition: SUCCESS
+ trigger-with-no-params: true
diff --git a/jobs/templates/released-heat-cicd-pike-dvr-sl.yml b/jobs/templates/released-heat-cicd-pike-dvr-sl.yml
index ad28b00..51b2f80 100644
--- a/jobs/templates/released-heat-cicd-pike-dvr-sl.yml
+++ b/jobs/templates/released-heat-cicd-pike-dvr-sl.yml
@@ -100,17 +100,6 @@
--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_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: |-
@@ -219,6 +208,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:
@@ -228,3 +221,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-pike-sl'
+ condition: SUCCESS
+ trigger-with-no-params: true
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
diff --git a/jobs/templates/released-heat-cicd-queens-dvr-sl.yml b/jobs/templates/released-heat-cicd-queens-dvr-sl.yml
index 6caec65..27a3263 100644
--- a/jobs/templates/released-heat-cicd-queens-dvr-sl.yml
+++ b/jobs/templates/released-heat-cicd-queens-dvr-sl.yml
@@ -100,17 +100,6 @@
--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_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: |-
@@ -219,6 +208,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:
@@ -228,3 +221,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-dvr-sl'
+ condition: SUCCESS
+ trigger-with-no-params: true