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 244c0d7311008db8016990e4850cdd3c3dd1db9c..fccdb2397ad1ce6d63f1dba01220970dd1bb9dd2 100755 (executable)
--- a/jenkins/run-docker-tests.sh
+++ b/jenkins/run-docker-tests.sh
@@ -13,11 +13,6 @@ echo $WORKSPACE
 # DOCKER
 title "Starting docker build"
 
-# 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)
-
 # clean up the docker build environment
 cd "$WORKSPACE"
 cd docker
@@ -39,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