projects
/
arvados-dev.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Set RAILS_ENV consistently. Support "sevices/keepstore_test=-v" etc. No issue #
[arvados-dev.git]
/
jenkins
/
run-docker-tests.sh
diff --git
a/jenkins/run-docker-tests.sh
b/jenkins/run-docker-tests.sh
index 8587996b4326f74df8fb4dfebfbf65d22fafabdf..e0c22882249b9cb03cffee5d43b4d79cca0ba6c7 100755
(executable)
--- a/
jenkins/run-docker-tests.sh
+++ b/
jenkins/run-docker-tests.sh
@@
-9,9
+9,14
@@
title () {
}
docker_push () {
}
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 !!!!!!"
if [[ "$ECODE" != "0" ]]; then
title "!!!!!! docker push $* failed !!!!!!"
@@
-19,6
+24,14
@@
docker_push () {
fi
}
fi
}
+timer_reset() {
+ t0=$SECONDS
+}
+
+timer() {
+ echo -n "$(($SECONDS - $t0))s"
+}
+
# Sanity check
if ! [[ -n "$WORKSPACE" ]]; then
echo >&2
# Sanity check
if ! [[ -n "$WORKSPACE" ]]; then
echo >&2
@@
-44,6
+57,8
@@
fi
# DOCKER
title "Starting docker build"
# DOCKER
title "Starting docker build"
+timer_reset
+
# clean up the docker build environment
cd "$WORKSPACE"
cd docker
# clean up the docker build environment
cd "$WORKSPACE"
cd docker
@@
-63,10
+78,12
@@
if [[ "$ECODE" != "0" ]]; then
EXITCODE=$(($EXITCODE + $ECODE))
fi
EXITCODE=$(($EXITCODE + $ECODE))
fi
-title "docker build complete"
+title "docker build complete
(`timer`)
"
title "uploading images"
title "uploading images"
+timer_reset
+
if [[ "$ECODE" == "0" ]]; then
docker_push arvados/api
docker_push arvados/compute
if [[ "$ECODE" == "0" ]]; then
docker_push arvados/api
docker_push arvados/compute
@@
-78,10
+95,12
@@
else
title "upload arvados images SKIPPED because build failed"
fi
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"
title "Starting docker java-bwa-samtools build"
+timer_reset
+
./build.sh java-bwa-samtools-image
ECODE=$?
./build.sh java-bwa-samtools-image
ECODE=$?
@@
-91,16
+110,17
@@
if [[ "$ECODE" != "0" ]]; then
EXITCODE=$(($EXITCODE + $ECODE))
fi
EXITCODE=$(($EXITCODE + $ECODE))
fi
-title "docker build java-bwa-samtools complete"
+title "docker build java-bwa-samtools complete
(`timer`)
"
title "upload arvados/jobs image"
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
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
exit $EXITCODE