commit 01c7d4b58b678d0422377178466a020dda6da854
author Damien Martin-Guillerez <dmarting@google.com> Thu Jul 13 14:39:20 2017 +0200
committer Damien Martin-Guillerez <dmarting@google.com> Thu Jul 13 16:22:42 2017 +0200
tree e105557edba5b39b937ab2278def9605dc700b8b
parent d8f64c2ba534d3c9a9eef881ad8ca27d04d21ef3

Test: print out the logs when the jenkins master timeout

Change-Id: Iccf35661a0bb04647b07321c018405c5216c1560

jenkins/test/common.sh

diff --git a/jenkins/test/common.sh b/jenkins/test/common.sh
index d82f091..2fa3843 100755
--- a/jenkins/test/common.sh
+++ b/jenkins/test/common.sh
@@ -63,7 +63,7 @@
     if (( "$(date +%s)" - "$ts" > "$timeout" )); then
       echo
       echo "Failed to connect to Jenkins, aborting..." >&2
-      exit 1
+      return 1
     fi
   done
   echo " ok."
@@ -95,7 +95,11 @@
   load_images >&2
   local jenkins="$(run_jenkins_master "${server}" "${port}" "$@")"
   port=$(get_jenkins_port "${jenkins}")
-  wait_for_server "${server}" "${port}" >&2
+  wait_for_server "${server}" "${port}" >&2 || {
+    echo "Docker logs:" >&2
+    ${DOCKER} logs "$jenkins"
+    exit 1
+  }
   local containers="$(run_containers "${jenkins}" | xargs)"
   echo "$jenkins $containers"
 }