[ARVADOS] updated: 7951799135bbc35b5e862886fa014b4cd951f72a

[Git user]

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

       via  7951799135bbc35b5e862886fa014b4cd951f72a (commit)
      from  55aafbb07904ca24390dd47ea960eae7cb2b909a (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 7951799135bbc35b5e862886fa014b4cd951f72a
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Mon Jul 3 17:41:17 2017 -0400

    Quote subshell expression in test_with_arvbox and make container reset more robust.
    no issue #
    
    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 88860c0..236658c 100755
--- a/sdk/cwl/test_with_arvbox.sh
+++ b/sdk/cwl/test_with_arvbox.sh
@@ -48,6 +48,8 @@ if test -z "$ARVBOX_CONTAINER" ; then
 fi
 
 if test $reset_container = 1 ; then
+    arvbox stop
+    docker rm $ARVBOX_CONTAINER
     arvbox reset -f
 fi
 
@@ -81,7 +83,7 @@ export ARVADOS_API_TOKEN=\$(cat /var/lib/arvados/superuser_token)
 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'])")
+  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

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


hooks/post-receive
--