[tcp-qa] add option to update salt to create-mcp-env
The "Deploy Openstack" pipeline now supports updating saltstack before
deploying components. This patch adds this option to the "tcp-qa" jobs
stack.
Closes-Bug: PROD-35376
Change-Id: I4b45d6f4a1997d05629f931eee5bb4e77780de41
diff --git a/tcp_tests/settings.py b/tcp_tests/settings.py
index d3a0aa3..5e60b86 100644
--- a/tcp_tests/settings.py
+++ b/tcp_tests/settings.py
@@ -101,6 +101,7 @@
STACK_INSTALL = os.environ.get('STACK_INSTALL', None)
BATCH_SIZE = os.environ.get('BATCH_SIZE', None)
DIST_UPGRADE_NODES = os.environ.get('DIST_UPGRADE_NODES', False)
+UPGRADE_SALTSTACK = os.environ.get('UPGRADE_SALTSTACK', False)
SKIP_SYNC_TIME = get_var_as_bool("SKIP_SYNC_TIME", False)
# OpenStack parameters to work with Heat stacks
diff --git a/tcp_tests/tests/system/test_mcp_update.py b/tcp_tests/tests/system/test_mcp_update.py
index 2fa1bfa..c906eb1 100644
--- a/tcp_tests/tests/system/test_mcp_update.py
+++ b/tcp_tests/tests/system/test_mcp_update.py
@@ -542,6 +542,7 @@
job_parameters = {
"TARGET_SERVERS": target,
"OS_DIST_UPGRADE": True,
+ "UPGRADE_SALTSTACK": False,
"OS_UPGRADE": True,
"INTERACTIVE": False}
upgrade_control_pipeline = drivetrain_actions.start_job_on_jenkins(
diff --git a/tcp_tests/tests/system/test_upgrade_pike_queens.py b/tcp_tests/tests/system/test_upgrade_pike_queens.py
index c4c9119..3ea2d23 100644
--- a/tcp_tests/tests/system/test_upgrade_pike_queens.py
+++ b/tcp_tests/tests/system/test_upgrade_pike_queens.py
@@ -194,7 +194,8 @@
job_name = 'deploy-upgrade-control'
job_parameters = {
'INTERACTIVE': False,
- 'OS_DIST_UPGRADE': True,
+ 'OS_DIST_UPGRADE': False,
+ 'UPGRADE_SALTSTACK': False,
'OS_UPGRADE': True
}
# ####### Run job for ctl* ###