Merge branch 'master' into 8724-keep-block-check-script

[arvados.git] / sdk / cwl / test_with_arvbox.sh

diff --git a/sdk/cwl/test_with_arvbox.sh b/sdk/cwl/test_with_arvbox.sh
index 0fda2b846130a19c715c76b1e916dc3c1a2cd109..bee193858410581801ca2308f8b4045f8dea0179 100755 (executable)
--- a/sdk/cwl/test_with_arvbox.sh
+++ b/sdk/cwl/test_with_arvbox.sh
@@ -6,17 +6,26 @@ fi
 
 reset_container=1
 leave_running=0
+config=dev
 
 while test -n "$1" ; do
     arg="$1"
     case "$arg" in
         --no-reset-container)
             reset_container=0
-            shift;
+            shift
             ;;
         --leave-running)
             leave_running=1
-            shift;
+            shift
+            ;;
+        --config)
+            config=$2
+            shift ; shift
+            ;;
+        -h|--help)
+            echo "$0 [--no-reset-container] [--leave-running] [--config dev|localdemo]"
+            exit
             ;;
         -*)
             break
@@ -30,10 +39,9 @@ fi
 
 if test $reset_container = 1 ; then
     arvbox reset -f
-    arvbox build dev
 fi
 
-arvbox start dev
+arvbox start $config
 
 arvbox pipe <<EOF
 set -eu -o pipefail
@@ -54,6 +62,9 @@ git pull
 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
+
 env
 exec ./run_test.sh "$@"
 EOF