[ARVADOS] updated: 2.1.0-2498-g1161c9460
Git user
git at public.arvados.org
Tue May 17 19:53:00 UTC 2022
Summary of changes:
sdk/cwl/test_with_arvbox.sh | 21 +--------------------
1 file changed, 1 insertion(+), 20 deletions(-)
via 1161c9460bfdce3a81872866ccc2cd200b8de2de (commit)
from f42ee7c19b794e25db30051b1dfc4bee83929bcd (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 1161c9460bfdce3a81872866ccc2cd200b8de2de
Author: Peter Amstutz <peter.amstutz at curii.com>
Date: Tue May 17 15:52:14 2022 -0400
19070: more test_with_arvbox fixes
Don't try to pull or upload arvados/jobs image, a-c-r already knows
how to do that.
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 33686df0d..0a64fe97a 100755
--- a/sdk/cwl/test_with_arvbox.sh
+++ b/sdk/cwl/test_with_arvbox.sh
@@ -83,7 +83,7 @@ fi
arvbox start $config $tag
-docker cp $(readlink -f $(dirname $0)/tests) $ARVBOX_CONTAINER:/usr/src/arvados/sdk/cwl/tests
+docker cp -L $(readlink -f $(dirname $0)/tests) $ARVBOX_CONTAINER:/usr/src/arvados/sdk/cwl
arvbox pipe <<EOF
set -eu -o pipefail
@@ -136,25 +136,6 @@ export ARVADOS_API_TOKEN=\$(cat /var/lib/arvados-arvbox/superuser_token)
if test -n "$build" ; then
/usr/src/arvados/build/build-dev-docker-jobs-image.sh
-elif test "$tag" = "latest" ; then
- arv-keepdocker --pull arvados/jobs $tag
-else
- set +u
- export WORKSPACE=/usr/src/arvados
- . /usr/src/arvados/build/run-library.sh
- TMPHERE=\$(pwd)
- cd /usr/src/arvados
-
- # This defines python_sdk_version and cwl_runner_version with python-style
- # package suffixes (.dev/rc)
- calculate_python_sdk_cwl_package_versions
-
- cd \$TMPHERE
- set -u
-
- arv-keepdocker --pull arvados/jobs \$cwl_runner_version
- docker tag arvados/jobs:\$cwl_runner_version arvados/jobs:latest
- arv-keepdocker arvados/jobs latest
fi
EXTRA=--compute-checksum
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list