[ARVADOS-DEV] updated: 95620c2efb18c5a89cc88995f5c1a09a054d56a9
git at public.curoverse.com
git at public.curoverse.com
Thu Aug 14 15:24:47 EDT 2014
Summary of changes:
jenkins/run-docker-tests.sh | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
via 95620c2efb18c5a89cc88995f5c1a09a054d56a9 (commit)
from aa4d046ce529b28b783c4b8044983d8676a2e7ca (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit 95620c2efb18c5a89cc88995f5c1a09a054d56a9
Author: Ward Vandewege <ward at curoverse.com>
Date: Thu Aug 14 15:24:09 2014 -0400
Make use of the realclean build.sh feature to build the docker images.
no issue #
diff --git a/jenkins/run-docker-tests.sh b/jenkins/run-docker-tests.sh
index 8ff8736..244c0d7 100755
--- a/jenkins/run-docker-tests.sh
+++ b/jenkins/run-docker-tests.sh
@@ -10,23 +10,24 @@ title () {
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 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=$?
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list