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/settings.py b/tcp_tests/settings.py
index 166b492..347e8e6 100644
--- a/tcp_tests/settings.py
+++ b/tcp_tests/settings.py
@@ -85,6 +85,10 @@
TEMPEST_TARGET = os.environ.get('TEMPEST_TARGET', 'gtw01')
SALT_VERSION = os.environ.get('SALT_VERSION', '2017.7')
+# REPOSITORY_SUITE is always defined in swarm-run-pytest from MCP_VERSION
+REPOSITORY_SUITE = os.environ.get('REPOSITORY_SUITE', 'proposed')
+MCP_VERSION = os.environ.get('MCP_VERSION', REPOSITORY_SUITE)
+
SL_TEST_REPO = os.environ.get('SL_TEST_REPO',
'https://github.com/Mirantis/stacklight-pytest')
SL_TEST_COMMIT = os.environ.get('SL_TEST_COMMIT', 'master')