commit 986e9f505d5ee666778bbd6feff4b3972def973f
author Hanna Arhipova <harhipova@mirantis.com> Mon Sep 20 14:21:10 2021 +0000
committer Gerrit Code Review <gerrit@172.18.228.131> Mon Sep 20 14:21:10 2021 +0000
tree 1c96783a8e832230c3aebda8fcdfbf262689e186
parent 99364cb6139849c097fe03c11e9bc31adbd5b139
parent 5395f78c2628610a193f806efb135d74748f25ef

Merge "Fix path to Tempests's skiplist"

jobs/templates/swarm-run-pytest.yml

diff --git a/jobs/templates/swarm-run-pytest.yml b/jobs/templates/swarm-run-pytest.yml
index 9d22f9d..ae0330c 100644
--- a/jobs/templates/swarm-run-pytest.yml
+++ b/jobs/templates/swarm-run-pytest.yml
@@ -12,6 +12,11 @@
         trim: 'false'
     - string:
         default: ''
+        description: 'Required: Config name'
+        name: LAB_CONFIG_NAME
+        trim: 'false'
+    - string:
+        default: ''
         description: 'Example: refs/changes/89/411189/36
                        (for now - only one reference allowed)'
         name: TCP_QA_REFS

tcp_tests/tests/system/test_cvp_pipelines.py

diff --git a/tcp_tests/tests/system/test_cvp_pipelines.py b/tcp_tests/tests/system/test_cvp_pipelines.py
index 41c95fe..fc04bcc 100644
--- a/tcp_tests/tests/system/test_cvp_pipelines.py
+++ b/tcp_tests/tests/system/test_cvp_pipelines.py
@@ -120,10 +120,10 @@
         dt = drivetrain_actions
         jenkins_start_timeout = 60
         jenkins_build_timeout = 6 * 60 * 60
-        cluster_name = settings.ENV_NAME
+        lab_config_name = settings.LAB_CONFIG_NAME
         tempest_pattern = settings.TEMPEST_PATTERN
         skiplist_file = "tcp_tests/templates/{}/tempest_skip.list".\
-            format(cluster_name)
+            format(lab_config_name)
 
         show_step(1)
         salt.sync_time()