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: Iade5150760cc43832998b16d802e8aac3738f879
diff --git a/tcp_tests/tests/system/test_cvp_pipelines.py b/tcp_tests/tests/system/test_cvp_pipelines.py
index 80154a1..d91256c 100644
--- a/tcp_tests/tests/system/test_cvp_pipelines.py
+++ b/tcp_tests/tests/system/test_cvp_pipelines.py
@@ -117,10 +117,16 @@
jenkins_start_timeout = 60
jenkins_build_timeout = 1800
+ maas_minion_id = salt.get_single_pillar(
+ tgt='I@maas:cluster:enabled:True or I@maas:region:enabled:True',
+ pillar="__reclass__:nodename")
+
job_name = 'cvp-sanity'
job_parameters = {
'TEST_SET': '/var/lib/cvp-sanity/cvp_checks/tests/',
- 'TESTS_SETTINGS': 'drivetrain_version=proposed',
+ 'TESTS_SETTINGS': (
+ 'drivetrain_version={0};ntp_skipped_nodes={1}'
+ .format(settings.MCP_VERSION, maas_minion_id)),
}
show_step(2)