X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/3386dd9826cf143d078aa8985726516932fafa5b..62d56bce0d714cc2df2ab5e7f1005dc3d76f783b:/sdk/cwl/test_with_arvbox.sh

diff --git a/sdk/cwl/test_with_arvbox.sh b/sdk/cwl/test_with_arvbox.sh
index bc0289e204..5501e29645 100755
--- a/sdk/cwl/test_with_arvbox.sh
+++ b/sdk/cwl/test_with_arvbox.sh
@@ -7,6 +7,7 @@ fi
 reset_container=1
 leave_running=0
 config=dev
+docker_pull=1
 
 while test -n "$1" ; do
     arg="$1"
@@ -23,7 +24,15 @@ while test -n "$1" ; do
             config=$2
             shift ; shift
             ;;
-        -*)
+        --no-docker-pull)
+            docker_pull=0
+            shift
+            ;;
+        -h|--help)
+            echo "$0 [--no-reset-container] [--leave-running] [--no-docker-pull] [--config dev|localdemo]"
+            exit
+            ;;
+        *)
             break
             ;;
     esac
@@ -46,7 +55,7 @@ set -eu -o pipefail
 
 cd /usr/src/arvados/sdk/cwl
 python setup.py sdist
-pip_install \$(ls dist/arvados-cwl-runner-*.tar.gz | tail -n1)
+pip_install \$(ls -r dist/arvados-cwl-runner-*.tar.gz | head -n1)
 
 mkdir -p /tmp/cwltest
 cd /tmp/cwltest
@@ -59,10 +68,24 @@ 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
+if test $docker_pull = 1 ; then
+  arv-keepdocker --pull arvados/jobs
+fi
+
+cat >/tmp/cwltest/arv-cwl-jobs <<EOF2
+#!/bin/sh
+exec arvados-cwl-runner --api=jobs \\\$@
+EOF2
+chmod +x /tmp/cwltest/arv-cwl-jobs
+
+cat >/tmp/cwltest/arv-cwl-containers <<EOF2
+#!/bin/sh
+exec arvados-cwl-runner --api=containers \\\$@
+EOF2
+chmod +x /tmp/cwltest/arv-cwl-containers
 
 env
-exec ./run_test.sh "$@"
+exec ./run_test.sh $@
 EOF
 
 CODE=$?