From bb1ef9ff8e1e5f9fb55738ec64e187f82c44b3de Mon Sep 17 00:00:00 2001 From: Peter Amstutz Date: Tue, 17 May 2022 14:20:24 -0400 Subject: [PATCH] 19070: Fixing CWL tests Arvados-DCO-1.1-Signed-off-by: Peter Amstutz --- sdk/cwl/test_with_arvbox.sh | 6 ++++-- sdk/cwl/tests/arvados-tests.sh | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/sdk/cwl/test_with_arvbox.sh b/sdk/cwl/test_with_arvbox.sh index 6268266ddd..7159b2ddd8 100755 --- a/sdk/cwl/test_with_arvbox.sh +++ b/sdk/cwl/test_with_arvbox.sh @@ -167,8 +167,10 @@ if [[ "$suite" = "integration" ]] ; then exec ./arvados-tests.sh $@ elif [[ "$suite" = "conformance-v1.2" ]] ; then exec cwltest --tool arvados-cwl-runner --test conformance_tests.yaml -Sdocker_entrypoint,timelimit_invalid_wf -N307 $@ -- \$EXTRA -else - exec cwltest --tool arvados-cwl-runner --test conformance_tests.yaml -Sdocker_entrypoint,timelimit_invalid_wf $@ -- \$EXTRA +elif [[ "$suite" = "conformance-v1.1" ]] ; then + exec cwltest --tool arvados-cwl-runner --test conformance_tests.yaml -Sdocker_entrypoint,timelimit_invalid_wf -N199 $@ -- \$EXTRA +elif [[ "$suite" = "conformance-v1.0" ]] ; then + exec cwltest --tool arvados-cwl-runner --test v1.0/conformance_test_v1.0.yaml -Sdocker_entrypoint,timelimit_invalid_wf $@ -- \$EXTRA fi EOF diff --git a/sdk/cwl/tests/arvados-tests.sh b/sdk/cwl/tests/arvados-tests.sh index 16b075bb80..7d27523d30 100755 --- a/sdk/cwl/tests/arvados-tests.sh +++ b/sdk/cwl/tests/arvados-tests.sh @@ -8,7 +8,7 @@ # conformance tests. # -set -e +set -ex if ! arv-get d7514270f356df848477718d58308cc4+94 > /dev/null ; then arv-put --portable-data-hash testdir/* @@ -24,7 +24,7 @@ if ! arv-get 20850f01122e860fb878758ac1320877+71 > /dev/null ; then fi # Use the python executor associated with the installed OS package, if present. -python=$(((ls /usr/share/python3*/dist/python3-arvados-cwl-runner/bin/python || echo python) | head -n1) 2>/dev/null) +python=$(((ls /usr/share/python3*/dist/python3-arvados-cwl-runner/bin/python || echo python3) | head -n1) 2>/dev/null) # Test for #18888 # This is a standalone test because the bug was observed with this -- 2.30.2