Fix cvp-sanity tests_settings
- Use the actual MCP version for 'drivetrain_version' parameter
instead of hardcoded 'proposed'
- Use 'ntp_skipped_nodes' to skip the cfg01 node with MaaS
Closes-Bugs: PROD-21993, PROD-27182, PROD-27980
Change-Id: Ib3f5abe305d810c6794a5941c8c8be0a0b11114c
diff --git a/tcp_tests/tests/system/test_offline.py b/tcp_tests/tests/system/test_offline.py
index 4d73e84..62b1c9f 100644
--- a/tcp_tests/tests/system/test_offline.py
+++ b/tcp_tests/tests/system/test_offline.py
@@ -263,8 +263,14 @@
salt_deployed.update_ssh_data_from_minions()
show_step(4)
+ maas_minion_id = salt_deployed.get_single_pillar(
+ tgt='I@maas:cluster or I@maas:region',
+ pillar="__reclass__:nodename")
+
params = jenkins.make_defults_params('cvp-sanity')
- params['TESTS_SETTINGS'] = 'drivetrain_version=proposed'
+ params['TESTS_SETTINGS'] = (
+ 'drivetrain_version={0};ntp_skipped_nodes={1}'
+ .format(settings.MCP_VERSION, maas_minion_id))
build = jenkins.run_build('cvp-sanity', params)
LOG.info("Take a look test progress here - %s. Build #%s",
"http://172.16.44.33:8081/job/cvp-sanity/", build[1])