20096: Tweak test_with_arvbox.sh 20096-cwltest
authorPeter Amstutz <peter.amstutz@curii.com>
Mon, 13 Feb 2023 19:38:38 +0000 (14:38 -0500)
committerPeter Amstutz <peter.amstutz@curii.com>
Mon, 13 Feb 2023 19:38:38 +0000 (14:38 -0500)
Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz@curii.com>

sdk/cwl/test_with_arvbox.sh

index 354d6f0e567f5e4fb93b8d3c96acd8af132b25dd..e09aa74e2534e4474cc25d36e76971607c751342 100755 (executable)
@@ -130,6 +130,14 @@ elif [[ "$suite" != "integration" ]] ; then
    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
@@ -150,6 +158,8 @@ fi
 
 env
 
+cwltest --version
+
 # Skip docker_entrypoint test because it fails on singularity
 #
 # Skip timelimit_invalid_wf test because the timeout is very short