Fix another -z that should have been -n. refs #3894

[arvados-dev.git] / jenkins / run-docker-tests.sh

diff --git a/jenkins/run-docker-tests.sh b/jenkins/run-docker-tests.sh
index 8ff87369ea0a0de3e79e44fedcfc839d478c1320..fccdb2397ad1ce6d63f1dba01220970dd1bb9dd2 100755 (executable)
--- a/jenkins/run-docker-tests.sh
+++ b/jenkins/run-docker-tests.sh
@@ -10,23 +10,19 @@ title () {
 
 echo $WORKSPACE
 
-# clean up existing docker containers and images
-docker.io stop $(docker.io ps -a -q)
-docker.io rm $(docker.io ps -a -q)
-docker.io rmi $(docker.io images -q)
+# DOCKER
+title "Starting docker build"
 
-# clean up build files so we can re-build
-rm -f $WORKSPACE/docker/*-image
+# clean up the docker build environment
+cd "$WORKSPACE"
+cd docker
+./build.sh realclean
 
-rm -f docker/config.yml
+rm -f config.yml
 
 # Get test config.yml file
-cp $HOME/docker/config.yml docker/
+cp $HOME/docker/config.yml .
 
-# DOCS
-title "Starting docker build"
-cd "$WORKSPACE"
-cd docker
 ./build.sh
 
 ECODE=$?
@@ -38,4 +34,17 @@ fi
 
 title "docker build complete"
 
+title "Starting docker java-bwa-samtools build"
+
+./build.sh java-bwa-samtools-image
+
+ECODE=$?
+
+if [[ "$ECODE" != "0" ]]; then
+  title "!!!!!! docker java-bwa-samtools BUILD FAILED !!!!!!"
+  EXITCODE=$(($EXITCODE + $ECODE))
+fi
+
+title "docker build java-bwa-samtools complete"
+
 exit $EXITCODE