Fix sanity and stacklight report
Related-Prod:PROD-36500
Change-Id: I1515ff1d47a17bea2a5574ecb01c66f2e87e91d9
diff --git a/jobs/pipelines/swarm-run-pytest.groovy b/jobs/pipelines/swarm-run-pytest.groovy
index 65004b9..431d238 100644
--- a/jobs/pipelines/swarm-run-pytest.groovy
+++ b/jobs/pipelines/swarm-run-pytest.groovy
@@ -64,7 +64,7 @@
export ${it}_installed=true"""}.join("\n")
shared.run_sh(sources + installed + """
- mkdir tmp
+ mkdir -p tmp
export PYTHONHTTPSVERIFY=0
export TESTS_CONFIGS=${ENV_NAME}_salt_deployed.ini
export ENV_MANAGER=$ENV_MANAGER # use 'hardware' fixture to manage fuel-devops environment
@@ -81,6 +81,7 @@
archiveArtifacts artifacts: "tmp/*"
shared.run_sh("""
cd ${PARENT_WORKSPACE}
+ cp tmp/* ./
rm -rf tmp/
""")
diff --git a/jobs/pipelines/swarm-testrail-report.groovy b/jobs/pipelines/swarm-testrail-report.groovy
index dc9ed1f..0c70353 100644
--- a/jobs/pipelines/swarm-testrail-report.groovy
+++ b/jobs/pipelines/swarm-testrail-report.groovy
@@ -69,9 +69,9 @@
// tempest_report_name =~ "report_*.xml"
def tempest_report_name = sh(script: find_latest("report_*.xml"), returnStdout: true).trim()
// stacklight_report_name =~ "stacklight_report.xml" or "report.xml"
- def stacklight_report_name = sh(script: find_latest("*report.xml"), returnStdout: true).trim()
+ def stacklight_report_name = sh(script: find_latest("cvp-stacklight*results.xml"), returnStdout: true).trim()
// cvp_sanity_report_name =~ cvp_sanity_report.xml
- def cvp_sanity_report_name = sh(script: find_latest("cvp_sanity_results.xml"), returnStdout: true).trim()
+ def cvp_sanity_report_name = sh(script: find_latest("cvp-sanity*results.xml"), returnStdout: true).trim()
common.printMsg(deployment_report_name ? "Found deployment report: ${deployment_report_name}" : "Deployment report not found", deployment_report_name ? "blue" : "red")
common.printMsg(tcpqa_report_name ? "Found tcp-qa report: ${tcpqa_report_name}" : "tcp-qa report not found", tcpqa_report_name ? "blue" : "red")
common.printMsg(tempest_report_name ? "Found tempest report: ${tempest_report_name}" : "tempest report not found", tempest_report_name ? "blue" : "red")