Fix tempest.skiplist name for deployments with non-default name
Change-Id: I53ea684a824cbba73205c3413e6ea98732599925
diff --git a/jobs/pipelines/swarm-run-pytest.groovy b/jobs/pipelines/swarm-run-pytest.groovy
index 431d238..21fdb9e 100644
--- a/jobs/pipelines/swarm-run-pytest.groovy
+++ b/jobs/pipelines/swarm-run-pytest.groovy
@@ -12,6 +12,7 @@
* PARENT_WORKSPACE Path to the workspace of the parent job to use tcp-qa repo
* TCP_QA_REFS Reference to the tcp-qa change on Gerrit, like refs/changes/46/418546/41
* SHUTDOWN_ENV_ON_TEARDOWN optional, shutdown fuel-devops environment at the end of the job
+ * LAB_CONFIG_NAME
* TEMPEST_IMAGE_VERSION Tempest image version: pike by default, can be queens.
* TEMPEST_TARGET Node where tempest will be run
* MAKE_SNAPSHOT_STAGES optional, use "dos.py snapshot" to snapshot stages
@@ -68,6 +69,7 @@
export PYTHONHTTPSVERIFY=0
export TESTS_CONFIGS=${ENV_NAME}_salt_deployed.ini
export ENV_MANAGER=$ENV_MANAGER # use 'hardware' fixture to manage fuel-devops environment
+ export LAB_CONFIG_NAME=${LAB_CONFIG_NAME}
export salt_master_host=\$SALT_MASTER_IP # skip salt_deployed fixture
export salt_master_port=6969
export SALT_USER=\$SALTAPI_USER
diff --git a/jobs/templates/swarm-run-pytest.yml b/jobs/templates/swarm-run-pytest.yml
index 9d22f9d..e06b3ef 100644
--- a/jobs/templates/swarm-run-pytest.yml
+++ b/jobs/templates/swarm-run-pytest.yml
@@ -12,6 +12,11 @@
trim: 'false'
- string:
default: ''
+ description: ''
+ 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/src/com/mirantis/system_qa/SharedPipeline.groovy b/src/com/mirantis/system_qa/SharedPipeline.groovy
index 98c0252..50f883f 100644
--- a/src/com/mirantis/system_qa/SharedPipeline.groovy
+++ b/src/com/mirantis/system_qa/SharedPipeline.groovy
@@ -383,6 +383,7 @@
def tempest_pattern=env.TEMPEST_PATTERN ?: 'tempest'
def parameters = [
string(name: 'ENV_NAME', value: "${ENV_NAME}"),
+ string(name: 'LAB_CONFIG_NAME', value: "${LAB_CONFIG_NAME}"),
string(name: 'PASSED_STEPS', value: passed_steps),
text(name: 'RUN_TEST_OPTS', value: "${RUN_TEST_OPTS}"),
string(name: 'PARENT_NODE_NAME', value: jenkins_slave_node_name),