projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '20472-priority-update' refs #20472
[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 354d6f0e567f5e4fb93b8d3c96acd8af132b25dd..6823a8e2a5158dcb62d4614ff888eca81816a97b 100755
(executable)
--- a/
sdk/cwl/test_with_arvbox.sh
+++ b/
sdk/cwl/test_with_arvbox.sh
@@
-130,6
+130,14
@@
elif [[ "$suite" != "integration" ]] ; then
exit 1
fi
exit 1
fi
+if [[ "$suite" = "conformance-v1.1" ]] ; then
+ git checkout main
+fi
+
+if [[ "$suite" = "conformance-v1.2" ]] ; then
+ git checkout 1.2.1_proposed
+fi
+
#if [[ "$suite" != "integration" ]] ; then
# git pull
#fi
#if [[ "$suite" != "integration" ]] ; then
# git pull
#fi
@@
-150,6
+158,9
@@
fi
env
env
+arvados-cwl-runner --version
+cwltest --version
+
# Skip docker_entrypoint test because it fails on singularity
#
# Skip timelimit_invalid_wf test because the timeout is very short
# Skip docker_entrypoint test because it fails on singularity
#
# Skip timelimit_invalid_wf test because the timeout is very short