Revert "Fix path to Tempests's skiplist"
This reverts commit 5395f78c2628610a193f806efb135d74748f25ef.
Reason for revert: Need to change several part of tcp-qa
Change-Id: I2fee49a65c75da1f5acf2d099aa22e36801971e2
diff --git a/jobs/templates/swarm-run-pytest.yml b/jobs/templates/swarm-run-pytest.yml
index ae0330c..9d22f9d 100644
--- a/jobs/templates/swarm-run-pytest.yml
+++ b/jobs/templates/swarm-run-pytest.yml
@@ -12,11 +12,6 @@
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
diff --git a/tcp_tests/tests/system/test_cvp_pipelines.py b/tcp_tests/tests/system/test_cvp_pipelines.py
index fc04bcc..41c95fe 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
- lab_config_name = settings.LAB_CONFIG_NAME
+ cluster_name = settings.ENV_NAME
tempest_pattern = settings.TEMPEST_PATTERN
skiplist_file = "tcp_tests/templates/{}/tempest_skip.list".\
- format(lab_config_name)
+ format(cluster_name)
show_step(1)
salt.sync_time()