10461: Remove arv-keepdocker pull from test_with_arvbox.sh. Only install

arvados-cwl-runner in 'dev' configuration.

diff --git a/sdk/cwl/test_with_arvbox.sh b/sdk/cwl/test_with_arvbox.sh
index 3b16bbcc200819f04386db92b698db5b46f276c8..ee8daa1e15cbfc1147a00839b8d7da9f69c7d1fe 100755 (executable)
--- a/sdk/cwl/test_with_arvbox.sh
+++ b/sdk/cwl/test_with_arvbox.sh
@@ -9,7 +9,6 @@ fi
 reset_container=1
 leave_running=0
 config=dev
-docker_pull=1
 tag=""
 
 while test -n "$1" ; do
@@ -27,16 +26,12 @@ while test -n "$1" ; do
             config=$2
             shift ; shift
             ;;
-        --no-docker-pull)
-            docker_pull=0
-            shift
-            ;;
         --tag)
             tag=$2
             shift ; shift
             ;;
         -h|--help)
-            echo "$0 [--no-reset-container] [--leave-running] [--no-docker-pull] [--config dev|localdemo] [--tag docker_tag]"
+            echo "$0 [--no-reset-container] [--leave-running] [--config dev|localdemo] [--tag docker_tag]"
             exit
             ;;
         *)
@@ -60,9 +55,11 @@ set -eu -o pipefail
 
 . /usr/local/lib/arvbox/common.sh
 
-cd /usr/src/arvados/sdk/cwl
-python setup.py sdist
-pip_install \$(ls -r dist/arvados-cwl-runner-*.tar.gz | head -n1)
+if test $config = dev ; then
+  cd /usr/src/arvados/sdk/cwl
+  python setup.py sdist
+  pip_install \$(ls -r dist/arvados-cwl-runner-*.tar.gz | head -n1)
+fi
 
 mkdir -p /tmp/cwltest
 cd /tmp/cwltest
@@ -75,10 +72,6 @@ export ARVADOS_API_HOST=localhost:8000
 export ARVADOS_API_HOST_INSECURE=1
 export ARVADOS_API_TOKEN=\$(cat /var/lib/arvados/superuser_token)
 
-if test $docker_pull = 1 ; then
-  arv-keepdocker --pull arvados/jobs $tag
-fi
-
 cat >/tmp/cwltest/arv-cwl-jobs <<EOF2
 #!/bin/sh
 exec arvados-cwl-runner --api=jobs --compute-checksum \\\$@