8442: Bugfixes from end-to-end testing.

diff --git a/sdk/cwl/arvados_cwl/arvcontainer.py b/sdk/cwl/arvados_cwl/arvcontainer.py
index 384b03b6d9c28f17d847688439466c75527c0a2c..2fb2c33b39088b031ed39ab5f66518e6316c4389 100644 (file)
--- a/sdk/cwl/arvados_cwl/arvcontainer.py
+++ b/sdk/cwl/arvados_cwl/arvcontainer.py
@@ -19,6 +19,7 @@ class ArvadosContainer(object):
     def __init__(self, runner):
         self.arvrunner = runner
         self.running = False
+        self.uuid = None
 
     def update_pipeline_component(self, r):
         pass

diff --git a/sdk/cwl/arvados_cwl/arvdocker.py b/sdk/cwl/arvados_cwl/arvdocker.py
index 253df993044935ea014238489ae777437fb1590e..3cc1a42ae2a0693ae0b7494fed9849eadc417e89 100644 (file)
--- a/sdk/cwl/arvados_cwl/arvdocker.py
+++ b/sdk/cwl/arvados_cwl/arvdocker.py
@@ -1,6 +1,7 @@
 import logging
 import cwltool.docker
 import arvados.commands.keepdocker
+import sys
 
 logger = logging.getLogger('arvados.cwl-runner')
 

diff --git a/sdk/cwl/arvados_cwl/arvjob.py b/sdk/cwl/arvados_cwl/arvjob.py
index 693bbeb22aa90794a8ef0e82758375c3c82bcf56..f129dfa80436451b0e0fc04dd0aef93df60f3417 100644 (file)
--- a/sdk/cwl/arvados_cwl/arvjob.py
+++ b/sdk/cwl/arvados_cwl/arvjob.py
@@ -26,6 +26,7 @@ class ArvadosJob(object):
     def __init__(self, runner):
         self.arvrunner = runner
         self.running = False
+        self.uuid = None
 
     def run(self, dry_run=False, pull_image=True, **kwargs):
         script_parameters = {

diff --git a/sdk/cwl/test_with_arvbox.sh b/sdk/cwl/test_with_arvbox.sh
index bee193858410581801ca2308f8b4045f8dea0179..5501e2964557fa5346d32ab798aa3e4a2381abb8 100755 (executable)
--- 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,11 +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] [--config dev|localdemo]"
+            echo "$0 [--no-reset-container] [--leave-running] [--no-docker-pull] [--config dev|localdemo]"
             exit
             ;;
-        -*)
+        *)
             break
             ;;
     esac
@@ -50,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
@@ -63,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=$?