aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristophe Lyon <christophe.lyon@linaro.org>2017-03-23 14:49:37 +0000
committerChristophe Lyon <christophe.lyon@linaro.org>2017-04-11 12:05:17 +0000
commitf0e06d99ffc17dce1eb586dcbcc5a051dbdaa2a1 (patch)
tree995ee67da45289e7fe8b464dc56c4d6f103a2d03
parent92e2100ba77c9586c16b2d34d3ca6d25a8e54e43 (diff)
tcwg-buildfarm: Do not remove containers if the build failed.
So that we can investigate the causes of failure. Change-Id: Id38b7368267d5bb104825053e588f144221ad65f
-rw-r--r--tcwg-buildfarm.yaml9
1 files changed, 9 insertions, 0 deletions
diff --git a/tcwg-buildfarm.yaml b/tcwg-buildfarm.yaml
index cff4ace5cb..0d64cb6fe6 100644
--- a/tcwg-buildfarm.yaml
+++ b/tcwg-buildfarm.yaml
@@ -377,6 +377,15 @@
${BUILD_CONTAINER} "cd ${WORKSPACE} && bash -x ${WORKSPACE}/jenkins-scripts/jenkins.sh --workspace ${WORKSPACE} --abedir ${WORKSPACE} --target ${target} --override \"$override\" --languages ${languages} $bootstrap $runtests_opt $excludecheck_opt ${extraconfig_opt} --logserver $log_server $logname_opt $norebuild" || result=$?
+ # If the build failed, we want to keep the containers to investigate the problem, so remove the cleanup trap handler.
+ if [ $result -ne 0 ]; then
+ if [ x"${SSH_AGENT_CLEANUP}" = x ]; then
+ trap - EXIT
+ else
+ trap "eval \`${SSH_AGENT_CLEANUP}\`" EXIT
+ fi
+ fi
+
# If we actually built a toolchain, save its manifest.
# If the build was a no-op (results already present on log_server),
# copy the existing ones.