Fix reporting: check description.txt on master and slave nodes
Change-Id: Idfa395ffd4f67be928fee62f97d09235283a0b01
diff --git a/jobs/pipelines/deploy-cicd-and-run-tests.groovy b/jobs/pipelines/deploy-cicd-and-run-tests.groovy
index e8e88c2..fb039d3 100644
--- a/jobs/pipelines/deploy-cicd-and-run-tests.groovy
+++ b/jobs/pipelines/deploy-cicd-and-run-tests.groovy
@@ -145,10 +145,16 @@
archiveArtifacts artifacts: "**/*.xml,**/*.ini,**/*.log,**/*.tar.gz"
}
if ("${env.REPORT_TO_TESTRAIL}" != "false") {
- stage("report results to testrail") {
- common.printMsg("Running on: " + node_with_reports, "blue")
- shared.swarm_testrail_report(steps, node_with_reports)
+ stage("report results to testrail") {
+ common.printMsg("Running on: " + node_with_reports, "blue")
+ shared.swarm_testrail_report(steps, node_with_reports)
}
+ stage("Store TestRail reports to job description from ${jenkins_slave_node_name}") {
+ if (fileExists("description.txt")) {
+ def String description = readFile("description.txt")
+ currentBuild.description += "${description}"
+ }
+ }
}
}
}
@@ -168,10 +174,9 @@
shared.swarm_testrail_report(steps, env.NODE_NAME)
}
stage("Store TestRail reports to job description") {
- if (fileExists("jenkins_agent_description.txt")){
-
- def String jenkins_agent_description = readFile("jenkins_agent_description.txt")
- currentBuild.description += "${jenkins_agent_description}"
+ if (fileExists("description.txt")) {
+ def String description = readFile("description.txt")
+ currentBuild.description += "${description}"
}
}
}