X-Git-Url: https://git.arvados.org/arvados-dev.git/blobdiff_plain/7b3296a9decf3443b47b386a399aecb5b996c3fa..65ecef658fb337d97db7025bcdd4107276988543:/jenkins/run-docker-tests.sh

diff --git a/jenkins/run-docker-tests.sh b/jenkins/run-docker-tests.sh
index 8fbf562..5be7b99 100755
--- a/jenkins/run-docker-tests.sh
+++ b/jenkins/run-docker-tests.sh
@@ -9,9 +9,14 @@ title () {
 }
 
 docker_push () {
-  docker push $*
-
-  ECODE=$?
+  # Sometimes docker push fails; retry it a few times if necessary.
+  for i in `seq 1 5`; do
+    $DOCKER push $*
+    ECODE=$?
+    if [[ "$ECODE" == "0" ]]; then
+      break
+    fi
+  done
 
   if [[ "$ECODE" != "0" ]]; then
     title "!!!!!! docker push $* failed !!!!!!"
@@ -19,11 +24,41 @@ docker_push () {
   fi
 }
 
+timer_reset() {
+    t0=$SECONDS
+}
+
+timer() {
+    echo -n "$(($SECONDS - $t0))s"
+}
+
+# Sanity check
+if ! [[ -n "$WORKSPACE" ]]; then
+  echo >&2
+  echo >&2 "Error: WORKSPACE environment variable not set"
+  echo >&2
+  exit 1
+fi
+
 echo $WORKSPACE
 
+# find the docker binary
+DOCKER=`which docker.io`
+
+if [[ "$DOCKER" == "" ]]; then
+  DOCKER=`which docker`
+fi
+
+if [[ "$DOCKER" == "" ]]; then
+  title "Error: you need to have docker installed. Could not find the docker executable."
+  exit 1
+fi
+
 # DOCKER
 title "Starting docker build"
 
+timer_reset
+
 # clean up the docker build environment
 cd "$WORKSPACE"
 cd docker
@@ -43,25 +78,31 @@ if [[ "$ECODE" != "0" ]]; then
   EXITCODE=$(($EXITCODE + $ECODE))
 fi
 
-title "docker build complete"
+title "docker build complete (`timer`)"
 
 title "uploading images"
 
+timer_reset
+
 if [[ "$ECODE" == "0" ]]; then
   docker_push arvados/api
   docker_push arvados/compute
   docker_push arvados/doc
   docker_push arvados/workbench
   docker_push arvados/keep
+  docker_push arvados/keepproxy
   docker_push arvados/shell
+  docker_push arvados/sso
 else
   title "upload arvados images SKIPPED because build failed"
 fi
 
-title "upload arvados images complete"
+title "upload arvados images complete (`timer`)"
 
 title "Starting docker java-bwa-samtools build"
 
+timer_reset
+
 ./build.sh java-bwa-samtools-image
 
 ECODE=$?
@@ -71,16 +112,17 @@ if [[ "$ECODE" != "0" ]]; then
   EXITCODE=$(($EXITCODE + $ECODE))
 fi
 
-title "docker build java-bwa-samtools complete"
+title "docker build java-bwa-samtools complete (`timer`)"
 
 title "upload arvados/jobs image"
 
+timer_reset
 if [[ "$ECODE" == "0" ]]; then
   docker_push arvados/jobs
 else
   title "upload arvados/jobs image SKIPPED because build failed"
 fi
 
-title "upload arvados/jobs image complete"
+title "upload arvados/jobs image complete (`timer`)"
 
 exit $EXITCODE