[ARVADOS] updated: 1.3.0-2225-gb6e38668c

Git user git at public.arvados.org
Wed Feb 26 19:03:16 UTC 2020


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

       via  b6e38668ce1190efe275283982bd83030dcf800d (commit)
      from  63b1854120110f1273e6a54458388e055717bf41 (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 b6e38668ce1190efe275283982bd83030dcf800d
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Wed Feb 26 13:55:46 2020 -0500

    12409: Add --devcwl
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>

diff --git a/sdk/cwl/test_with_arvbox.sh b/sdk/cwl/test_with_arvbox.sh
index 3b29d39c5..76aa43d61 100755
--- a/sdk/cwl/test_with_arvbox.sh
+++ b/sdk/cwl/test_with_arvbox.sh
@@ -12,6 +12,7 @@ fi
 reset_container=1
 leave_running=0
 config=dev
+devcwl=0
 tag="latest"
 pythoncmd=python3
 suite=conformance
@@ -40,6 +41,10 @@ while test -n "$1" ; do
             build=1
             shift
             ;;
+        --devcwl)
+            devcwl=1
+            shift
+            ;;
         --pythoncmd)
             pythoncmd=$2
             shift ; shift
@@ -146,12 +151,18 @@ exec arvados-cwl-runner --api=containers \\\$@
 EOF2
 chmod +x /tmp/cwltest/arv-cwl-containers
 
+EXTRA=--compute-checksum
+
+if [[ $devcwl == 1 ]] ; then
+   EXTRA="\$EXTRA --enable-dev"
+fi
+
 env
 if [[ "$suite" = "integration" ]] ; then
    cd /usr/src/arvados/sdk/cwl/tests
    exec ./arvados-tests.sh $@
 else
-   exec ./run_test.sh RUNNER=/tmp/cwltest/arv-cwl-${runapi} EXTRA=--compute-checksum $@
+   exec ./run_test.sh RUNNER=/tmp/cwltest/arv-cwl-${runapi} EXTRA="\$EXTRA" $@
 fi
 EOF
 

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list