projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Put the default arvados-cwl-runner --thread-count back down to 1.
[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 6de404f448e2c7c14911db1b45df7fe7ec0305f0..0021bc8d906c5531b70c79a87d9be169658b5c57 100755
(executable)
--- a/
sdk/cwl/test_with_arvbox.sh
+++ b/
sdk/cwl/test_with_arvbox.sh
@@
-129,7
+129,7
@@
fi
export ARVADOS_API_HOST=localhost:8000
export ARVADOS_API_HOST_INSECURE=1
export ARVADOS_API_HOST=localhost:8000
export ARVADOS_API_HOST_INSECURE=1
-export ARVADOS_API_TOKEN=\$(cat /var/lib/arvados/superuser_token)
+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
if test -n "$build" ; then
/usr/src/arvados/build/build-dev-docker-jobs-image.sh
@@
-141,7
+141,11
@@
else
. /usr/src/arvados/build/run-library.sh
TMPHERE=\$(pwd)
cd /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
calculate_python_sdk_cwl_package_versions
+
cd \$TMPHERE
set -u
cd \$TMPHERE
set -u