[ARVADOS] updated: 4db4e97167a25b519581fb5f4ebef2169464333e

[Git user]

Summary of changes:
 sdk/cwl/test_with_arvbox.sh | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

       via  4db4e97167a25b519581fb5f4ebef2169464333e (commit)
      from  04f9ccc7ca627d41175f44f515e4581b6937f43b (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 4db4e97167a25b519581fb5f4ebef2169464333e
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Mon Jun 19 10:29:23 2017 -0400

    test_with_arvbox determines the correct arvados/jobs image to pull by querying
    verison server. refs #11458
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curoverse.com>

diff --git a/sdk/cwl/test_with_arvbox.sh b/sdk/cwl/test_with_arvbox.sh
index 7e80165..ecab5e3 100755
--- a/sdk/cwl/test_with_arvbox.sh
+++ b/sdk/cwl/test_with_arvbox.sh
@@ -74,9 +74,13 @@ export ARVADOS_API_HOST=localhost:8000
 export ARVADOS_API_HOST_INSECURE=1
 export ARVADOS_API_TOKEN=\$(cat /var/lib/arvados/superuser_token)
 
-arv-keepdocker --pull arvados/jobs $tag
-if test "$tag" != "latest" ; then
-  docker tag arvados/jobs:$tag arvados/jobs:latest
+
+if test "$tag" = "latest" ; then
+  arv-keepdocker --pull arvados/jobs $tag
+else
+  jobsimg=$(curl http://versions.arvados.org/v1/commit/$tag | python -c "import json; import sys; sys.stdout.write(json.load(sys.stdin)['Versions']['Docker']['arvados/jobs'])")
+  arv-keepdocker --pull arvados/jobs $jobsimg
+  docker tag -f arvados/jobs:$jobsimg arvados/jobs:latest
   arv-keepdocker arvados/jobs latest
 fi
 

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


hooks/post-receive
--