Merge "Get rid of deploy_network_netmask context parameter for generate-product job"
diff --git a/test-model-generator.groovy b/test-model-generator.groovy
index 4134ca4..39723c6 100644
--- a/test-model-generator.groovy
+++ b/test-model-generator.groovy
@@ -168,6 +168,10 @@
currentBuild.result = "FAILURE"
throw e
} finally {
+ sh (script: """map=\$(docker ps --format '{{.Names}}:{{.ID}}' --filter name=operations);\
+ for cont in \$map ; do NAME="\${cont%%:*}";ID="\${cont##*:}"; docker logs \$ID > \$NAME.log 2>&1 ; done""")
+ archiveArtifacts "*.log"
+
if (fileExists(testReportHTMLFile)) {
archiveArtifacts artifacts: testReportHTMLFile
}
@@ -192,7 +196,7 @@
}
// Remove everything what is owned by root
testImage.inside(testImageOptions) {
- sh("rm -rf /var/lib/qa_reports/* ${env.WORKSPACE}/${apiProject} ${env.WORKSPACE}/${uiProject}")
+ sh("rm -rf /var/lib/qa_reports/* ${env.WORKSPACE}/${apiProject} ${env.WORKSPACE}/${uiProject} ${env.WORKSPACE}/*.log")
}
}
}