[ARVADOS-DEV] updated: 845e3998bb2b4175e947a20eea4ed530629a778b

git at public.curoverse.com git at public.curoverse.com
Wed May 27 10:17:21 EDT 2015


Summary of changes:
 jenkins/run-docker-tests.sh | 28 +++++++++++++++++++++++++---
 1 file changed, 25 insertions(+), 3 deletions(-)

       via  845e3998bb2b4175e947a20eea4ed530629a778b (commit)
       via  b6a5513611786d2c0a513bac3ab2db00d84bf289 (commit)
      from  1e7b6aa1f16e06b796e3ed3f66c48f38a9287a5d (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 845e3998bb2b4175e947a20eea4ed530629a778b
Merge: 1e7b6aa b6a5513
Author: Nico Cesar <nico at nicocesar.com>
Date:   Wed May 27 10:16:55 2015 -0400

    Merge branch '6135-docker-git-tag'
    
    closes #6135
    
    Conflicts:
    	jenkins/run-docker-tests.sh

diff --cc jenkins/run-docker-tests.sh
index f0afccb,4f584d8..6bf3859
--- a/jenkins/run-docker-tests.sh
+++ b/jenkins/run-docker-tests.sh
@@@ -50,7 -64,16 +64,15 @@@ title () 
  }
  
  docker_push () {
-   # Sometimes docker push fails; retry it a few times if necessary.
 -    echo $tags
+     if [[ ! -z "$tags" ]]
+     then
+         for tag in $( echo $tags|tr "," " " )
+         do
+              $DOCKER tag $1 $1:$tag
+         done
+     fi
+ 
+     # Sometimes docker push fails; retry it a few times if necessary.
      for i in `seq 1 5`; do
          $DOCKER push $*
          ECODE=$?

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list