Merge branch '19092-upload-crunchstat_summary-to-pypi'

[arvados-dev.git] / jenkins / run-cwl-test-suite.sh

diff --git a/jenkins/run-cwl-test-suite.sh b/jenkins/run-cwl-test-suite.sh
index 775ab81db78cf1526f6d279665e8e4dd20aa50f1..8a0090df2224b23d8a0ff20a97e26f9b9903c801 100755 (executable)
--- a/jenkins/run-cwl-test-suite.sh
+++ b/jenkins/run-cwl-test-suite.sh
@@ -108,9 +108,8 @@ if [[ ! -e cwl-v1.2 ]]; then
   git clone --depth 1 https://github.com/common-workflow-language/cwl-v1.2.git
 fi
 
-printf "%s\n%s\n" '#!/bin/sh' 'exec arvados-cwl-runner --api containers --compute-checksum --disable-reuse --eval-timeout 60 "$@"' > arvados-cwl-runner-with-checksum.sh
-chmod 755 arvados-cwl-runner-with-checksum.sh
-
 cd cwl-v1.2
-git pull
-./run_test.sh -j$JOBS --timeout=900 RUNNER=../arvados-cwl-runner-with-checksum.sh -Sdocker_entrypoint
+git fetch -t
+git checkout v1.2.0
+exec cwltest  -Sdocker_entrypoint,timelimit_invalid_wf -N307 \
+     -j$JOBS --timeout=900 --tool arvados-cwl-runner --test conformance_tests.yaml -- --compute-checksum --disable-reuse --eval-timeout 60