Upgrade saltstack set true by default
-set true for all proposed envs
Change-Id: I48f4ba93f20b19b0c2e013db0a2c6e6f9a4a2193
diff --git a/jobs/templates/2019.2.0-heat-cicd-pike-dvr-sl.yml b/jobs/templates/2019.2.0-heat-cicd-pike-dvr-sl.yml
index 66cd438..2b17956 100644
--- a/jobs/templates/2019.2.0-heat-cicd-pike-dvr-sl.yml
+++ b/jobs/templates/2019.2.0-heat-cicd-pike-dvr-sl.yml
@@ -202,7 +202,7 @@
description: Whether to perform dist-upgrade on virtual nodes during deployment
name: DIST_UPGRADE_NODES
- bool:
- default: false
+ 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
pipeline-scm:
diff --git a/jobs/templates/2019.2.0-heat-cicd-queens-contrail41-sl.yml b/jobs/templates/2019.2.0-heat-cicd-queens-contrail41-sl.yml
index 687d47d..df0c250 100644
--- a/jobs/templates/2019.2.0-heat-cicd-queens-contrail41-sl.yml
+++ b/jobs/templates/2019.2.0-heat-cicd-queens-contrail41-sl.yml
@@ -207,7 +207,7 @@
description: Whether to perform dist-upgrade on virtual nodes during deployment
name: DIST_UPGRADE_NODES
- bool:
- default: false
+ 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
pipeline-scm:
diff --git a/jobs/templates/2019.2.0-heat-cicd-queens-dvr-sl.yml b/jobs/templates/2019.2.0-heat-cicd-queens-dvr-sl.yml
index 230379f..a0ec82a 100644
--- a/jobs/templates/2019.2.0-heat-cicd-queens-dvr-sl.yml
+++ b/jobs/templates/2019.2.0-heat-cicd-queens-dvr-sl.yml
@@ -207,7 +207,7 @@
description: Whether to perform dist-upgrade on virtual nodes during deployment
name: DIST_UPGRADE_NODES
- bool:
- default: false
+ 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
pipeline-scm:
diff --git a/jobs/templates/bm-b300-cicd-queens-ovs-maas.yml b/jobs/templates/bm-b300-cicd-queens-ovs-maas.yml
index d07fc2d..108aadd 100644
--- a/jobs/templates/bm-b300-cicd-queens-ovs-maas.yml
+++ b/jobs/templates/bm-b300-cicd-queens-ovs-maas.yml
@@ -206,7 +206,7 @@
description: Whether to perform dist-upgrade on virtual nodes during deployment
name: DIST_UPGRADE_NODES
- bool:
- default: false
+ 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
pipeline-scm:
diff --git a/jobs/templates/bm-cicd-queens-ovs-maas.yml b/jobs/templates/bm-cicd-queens-ovs-maas.yml
index 2b104f7..fc07ba4 100644
--- a/jobs/templates/bm-cicd-queens-ovs-maas.yml
+++ b/jobs/templates/bm-cicd-queens-ovs-maas.yml
@@ -206,7 +206,7 @@
description: Whether to perform dist-upgrade on virtual nodes during deployment
name: DIST_UPGRADE_NODES
- bool:
- default: false
+ 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
pipeline-scm:
diff --git a/jobs/templates/heat-bm-cicd-queens-contrail-sl.yml b/jobs/templates/heat-bm-cicd-queens-contrail-sl.yml
index cae7d08..d8b6eeb 100644
--- a/jobs/templates/heat-bm-cicd-queens-contrail-sl.yml
+++ b/jobs/templates/heat-bm-cicd-queens-contrail-sl.yml
@@ -220,7 +220,7 @@
description: Whether to perform dist-upgrade on virtual nodes during deployment
name: DIST_UPGRADE_NODES
- bool:
- default: false
+ 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
pipeline-scm:
diff --git a/jobs/templates/heat-cicd-queens-dvr-sl.yml b/jobs/templates/heat-cicd-queens-dvr-sl.yml
index 3ba3d08..a159abd 100644
--- a/jobs/templates/heat-cicd-queens-dvr-sl.yml
+++ b/jobs/templates/heat-cicd-queens-dvr-sl.yml
@@ -206,7 +206,7 @@
description: Whether to perform dist-upgrade on virtual nodes during deployment
name: DIST_UPGRADE_NODES
- bool:
- default: false
+ 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
pipeline-scm:
diff --git a/jobs/templates/released-bm-pike-ovs.yml b/jobs/templates/released-bm-pike-ovs.yml
index 88cbdef..c3f1961 100644
--- a/jobs/templates/released-bm-pike-ovs.yml
+++ b/jobs/templates/released-bm-pike-ovs.yml
@@ -186,7 +186,7 @@
description: Whether to perform dist-upgrade on virtual nodes during deployment
name: DIST_UPGRADE_NODES
- bool:
- default: false
+ 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
pipeline-scm:
diff --git a/tcp_tests/tests/system/test_mcp_update.py b/tcp_tests/tests/system/test_mcp_update.py
index 69253c9..db2cb26 100644
--- a/tcp_tests/tests/system/test_mcp_update.py
+++ b/tcp_tests/tests/system/test_mcp_update.py
@@ -609,7 +609,7 @@
job_parameters = {
"TARGET_SERVERS": target,
"OS_DIST_UPGRADE": True,
- "UPGRADE_SALTSTACK": False,
+ "UPGRADE_SALTSTACK": True,
"OS_UPGRADE": True,
"INTERACTIVE": False}
job_result, job_description = drivetrain_actions.start_job_on_jenkins(