[ARVADOS-DEV] updated: bdfbb8c113d8e7f63bb8caa57010437826c59dc9

[git at public.curoverse.com]

Summary of changes:
 ...-docker-tests.sh => run-build-docker-images.sh} | 30 ---------------
 ...ker-tests.sh => run-build-docker-jobs-image.sh} | 44 ++--------------------
 2 files changed, 3 insertions(+), 71 deletions(-)
 copy jenkins/{run-docker-tests.sh => run-build-docker-images.sh} (84%)
 rename jenkins/{run-docker-tests.sh => run-build-docker-jobs-image.sh} (77%)

       via  bdfbb8c113d8e7f63bb8caa57010437826c59dc9 (commit)
      from  2edb46e696fa3ca24aeb0c820f15630ece41f0fc (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 bdfbb8c113d8e7f63bb8caa57010437826c59dc9
Author: Ward Vandewege <ward at curoverse.com>
Date:   Thu Jul 9 22:01:36 2015 -0400

    Build arvados/jobs docker image separately from the others.
    
    refs #6528

diff --git a/jenkins/run-docker-tests.sh b/jenkins/run-build-docker-images.sh
similarity index 84%
copy from jenkins/run-docker-tests.sh
copy to jenkins/run-build-docker-images.sh
index eff75ac..71910c2 100755
--- a/jenkins/run-docker-tests.sh
+++ b/jenkins/run-build-docker-images.sh
@@ -155,7 +155,6 @@ else
         ## even though credentials are already in .dockercfg
         docker login -u arvados
 
-
         docker_push arvados/api
         docker_push arvados/compute
         docker_push arvados/doc
@@ -170,33 +169,4 @@ else
     fi
 fi
 
-title "Starting docker java-bwa-samtools build"
-
-timer_reset
-
-./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 (`timer`)"
-
-timer_reset
-
-if [[ "$ECODE" != "0" ]]; then
-    title "upload arvados/jobs image SKIPPED because build failed"
-else
-    if [[ $upload == true ]]; then 
-        title "upload arvados/jobs image"
-        docker_push arvados/jobs
-        title "upload arvados/jobs image complete (`timer`)"
-    else
-        title "upload arvados images SKIPPED because no --upload option set"
-    fi
-fi
-
 exit $EXITCODE
diff --git a/jenkins/run-docker-tests.sh b/jenkins/run-build-docker-jobs-image.sh
similarity index 77%
rename from jenkins/run-docker-tests.sh
rename to jenkins/run-build-docker-jobs-image.sh
index eff75ac..2cc0692 100755
--- a/jenkins/run-docker-tests.sh
+++ b/jenkins/run-build-docker-jobs-image.sh
@@ -125,14 +125,13 @@ timer_reset
 # clean up the docker build environment
 cd "$WORKSPACE"
 cd docker
-./build.sh realclean
-
+rm -f jobs-image
 rm -f config.yml
 
 # Get test config.yml file
 cp $HOME/docker/config.yml .
 
-./build.sh
+./build.sh jobs-image
 
 ECODE=$?
 
@@ -155,45 +154,8 @@ else
         ## even though credentials are already in .dockercfg
         docker login -u arvados
 
-
-        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
-        title "upload arvados images complete (`timer`)"
-    else
-        title "upload arvados images SKIPPED because no --upload option set"
-    fi
-fi
-
-title "Starting docker java-bwa-samtools build"
-
-timer_reset
-
-./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 (`timer`)"
-
-timer_reset
-
-if [[ "$ECODE" != "0" ]]; then
-    title "upload arvados/jobs image SKIPPED because build failed"
-else
-    if [[ $upload == true ]]; then 
-        title "upload arvados/jobs image"
         docker_push arvados/jobs
-        title "upload arvados/jobs image complete (`timer`)"
+        title "upload arvados images complete (`timer`)"
     else
         title "upload arvados images SKIPPED because no --upload option set"
     fi

-----------------------------------------------------------------------


hooks/post-receive
--