Pass TEST_PLAN_NAME_PREFIX parameter to swarm-testrail-report job
Also fix REPORT_TO_TESTRAIL boolean logic
Change-Id: I9e926cd93995bbac75cdd26a09e8c26e9b0ed345
Related-PROD: PROD-28588
diff --git a/jobs/pipelines/deploy-cicd-and-run-tests.groovy b/jobs/pipelines/deploy-cicd-and-run-tests.groovy
index ca52a53..f5c5b9a 100644
--- a/jobs/pipelines/deploy-cicd-and-run-tests.groovy
+++ b/jobs/pipelines/deploy-cicd-and-run-tests.groovy
@@ -97,7 +97,7 @@
stage("Archive all xml reports") {
archiveArtifacts artifacts: "**/*.xml,**/*.ini,**/*.log,**/*.tar.gz"
}
- if (env.REPORT_TO_TESTRAIL ?: true) {
+ if ("${env.REPORT_TO_TESTRAIL}" != "false") {
stage("report results to testrail") {
shared.swarm_testrail_report(steps)
}
diff --git a/src/com/mirantis/system_qa/SharedPipeline.groovy b/src/com/mirantis/system_qa/SharedPipeline.groovy
index af4f4af..c4927ea 100644
--- a/src/com/mirantis/system_qa/SharedPipeline.groovy
+++ b/src/com/mirantis/system_qa/SharedPipeline.groovy
@@ -291,6 +291,7 @@
def common = new com.mirantis.mk.Common()
def tcp_qa_refs = env.TCP_QA_REFS ?: ''
def tempest_test_suite_name = env.TEMPEST_TEST_SUITE_NAME
+ def test_plan_name_prefix = env.TEST_PLAN_NAME_PREFIX ?: ''
def parameters = [
string(name: 'ENV_NAME', value: "${ENV_NAME}"),
string(name: 'LAB_CONFIG_NAME', value: "${LAB_CONFIG_NAME}"),
@@ -300,6 +301,7 @@
string(name: 'PARENT_WORKSPACE', value: pwd()),
string(name: 'TCP_QA_REFS', value: "${tcp_qa_refs}"),
string(name: 'TEMPEST_TEST_SUITE_NAME', value: "${tempest_test_suite_name}"),
+ string(name: 'TEST_PLAN_NAME_PREFIX', value: "${test_plan_name_prefix}"),
]
common.printMsg("Start building job 'swarm-testrail-report' with parameters:", "purple")
common.prettyPrint(parameters)