[arvados] updated: 2.7.2-12-ga9b1e8d73d

[git repository hosting]

Summary of changes:
 sdk/cwl/test_with_arvbox.sh    | 19 ++++++++++---------
 sdk/cwl/tests/arvados-tests.sh |  2 +-
 2 files changed, 11 insertions(+), 10 deletions(-)

       via  a9b1e8d73d23907c5945c848e5ea46e04d80a71e (commit)
       via  80bdf6b2c00ae184c728ce7b6030c874bbb002d2 (commit)
       via  ce3d54f7886ad476bb7a7d2c8763ec381f9fb5a3 (commit)
      from  d4219ff6b2802114de60c88783d9452ea0e6953c (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 a9b1e8d73d23907c5945c848e5ea46e04d80a71e
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Thu Jan 18 10:32:12 2024 -0500

    21394: Emit conformance badges json from test_with_arvbox
    
    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 90dac3249e..7ee39cbcf2 100755
--- a/sdk/cwl/test_with_arvbox.sh
+++ b/sdk/cwl/test_with_arvbox.sh
@@ -5,8 +5,10 @@
 
 set -x
 
+cwldir=$(readlink -f $(dirname $0))
+
 if ! which arvbox >/dev/null ; then
-    export PATH=$PATH:$(readlink -f $(dirname $0)/../../tools/arvbox/bin)
+    export PATH=$PATH:$cwldir/../../tools/arvbox/bin
 fi
 
 reset_container=1
@@ -92,7 +94,7 @@ arvbox start $config $tag
 # of using the one inside the container, so we can make changes to the
 # integration tests without necessarily having to rebuilding the
 # container image.
-docker cp -L $(readlink -f $(dirname $0)/tests) $ARVBOX_CONTAINER:/usr/src/arvados/sdk/cwl
+docker cp -L $cwldir/tests $ARVBOX_CONTAINER:/usr/src/arvados/sdk/cwl
 
 arvbox pipe <<EOF
 set -eu -o pipefail
@@ -183,24 +185,23 @@ cwltest --version
 # Skip test 199 in the v1.1 suite because it has different output
 # depending on whether there is a pty associated with stdout (fixed in
 # the v1.2 suite)
-#
-# Skip test 307 in the v1.2 suite because the test relied on
-# secondary file behavior of cwltool that wasn't actually correct to specification
 
 if [[ "$suite" = "integration" ]] ; then
    cd /usr/src/arvados/sdk/cwl/tests
    exec ./arvados-tests.sh $@
 elif [[ "$suite" = "conformance-v1.2" ]] ; then
-   exec cwltest --tool arvados-cwl-runner --test conformance_tests.yaml -Sdocker_entrypoint $@ -- \$EXTRA
+   exec cwltest --tool arvados-cwl-runner --test conformance_tests.yaml -Sdocker_entrypoint --badgedir /tmp/badges $@ -- \$EXTRA
 elif [[ "$suite" = "conformance-v1.1" ]] ; then
-   exec cwltest --tool arvados-cwl-runner --test conformance_tests.yaml -Sdocker_entrypoint,timelimit_invalid_wf -N199 $@ -- \$EXTRA
+   exec cwltest --tool arvados-cwl-runner --test conformance_tests.yaml -Sdocker_entrypoint,timelimit_invalid_wf -N199 --badgedir /tmp/badges $@ -- \$EXTRA
 elif [[ "$suite" = "conformance-v1.0" ]] ; then
-   exec cwltest --tool arvados-cwl-runner --test v1.0/conformance_test_v1.0.yaml -Sdocker_entrypoint $@ -- \$EXTRA
+   exec cwltest --tool arvados-cwl-runner --test v1.0/conformance_test_v1.0.yaml -Sdocker_entrypoint --badgedir /tmp/badges $@ -- \$EXTRA
 fi
 EOF
 
 CODE=$?
 
+docker cp -L $ARVBOX_CONTAINER:/tmp/badges $cwldir/badges
+
 if test $leave_running = 0 ; then
     arvbox stop
 fi

commit 80bdf6b2c00ae184c728ce7b6030c874bbb002d2
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Wed Jan 17 15:28:20 2024 -0500

    21394: use /opt/arvados-py if present
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>

diff --git a/sdk/cwl/tests/arvados-tests.sh b/sdk/cwl/tests/arvados-tests.sh
index 9d6646e875..8f0c44c553 100755
--- a/sdk/cwl/tests/arvados-tests.sh
+++ b/sdk/cwl/tests/arvados-tests.sh
@@ -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 python3) | head -n1) 2>/dev/null)
+python=$(((ls /usr/share/python3*/dist/python3-arvados-cwl-runner/bin/python || ls /opt/arvados-py/bin/python || echo python3) | head -n1) 2>/dev/null)
 
 # Test for #18888
 # This is a standalone test because the bug was observed with this

commit ce3d54f7886ad476bb7a7d2c8763ec381f9fb5a3
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Tue Jan 16 20:18:53 2024 -0500

    21394: Use v1.2.1 tag for CWL conformance tests
    
    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 55099afdf7..90dac3249e 100755
--- a/sdk/cwl/test_with_arvbox.sh
+++ b/sdk/cwl/test_with_arvbox.sh
@@ -148,7 +148,7 @@ if [[ "$suite" = "conformance-v1.1" ]] ; then
 fi
 
 if [[ "$suite" = "conformance-v1.2" ]] ; then
-   git checkout 1.2.1_proposed
+   git checkout v1.2.1
 fi
 
 #if [[ "$suite" != "integration" ]] ; then
@@ -191,7 +191,7 @@ if [[ "$suite" = "integration" ]] ; then
    cd /usr/src/arvados/sdk/cwl/tests
    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
+   exec cwltest --tool arvados-cwl-runner --test conformance_tests.yaml -Sdocker_entrypoint $@ -- \$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

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


hooks/post-receive
--