commit 64f8d589d0a63de256b1c511707f1731dfb0ce8c
author Damien Martin-Guillerez <dmarting@google.com> Mon Jul 17 10:52:03 2017 +0200
committer Damien Martin-Guillerez <dmarting@google.com> Mon Jul 17 10:54:41 2017 +0200
tree 4596b69ca77674c2cbaf2e16dd2bf6348c96db31
parent e936946ae60641bb3110b785eb931a06dd7a8c99

Test: force remove the master containers if the jenkins fails to start

This will avoid leaving running container in the background whereas
the test has failed.

Change-Id: Ide8f940a6834a090693bcf22e98cd6f496ce2221

jenkins/test/common.sh

diff --git a/jenkins/test/common.sh b/jenkins/test/common.sh
index 41ae13c..932b405 100755
--- a/jenkins/test/common.sh
+++ b/jenkins/test/common.sh
@@ -98,6 +98,7 @@
   wait_for_server "${server}" "${port}" >&2 || {
     echo "Docker logs:" >&2
     ${DOCKER} logs "$jenkins"
+    ${DOCKER} rm -f "${jenkins}" >&2
     exit 1
   }
   local containers="$(run_containers "${jenkins}" | xargs)"