[ARVADOS] updated: 1.3.0-1436-g8829652bd
Git user
git at public.curoverse.com
Fri Aug 2 17:19:09 UTC 2019
Summary of changes:
build/run-tests.sh | 29 +++++++++++++++++------------
1 file changed, 17 insertions(+), 12 deletions(-)
via 8829652bd4d963bf9371a4ca92a6fb5b9a3f0e2b (commit)
from 327e331c0d421d805b380bc4f9dc8d17f683eadf (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 8829652bd4d963bf9371a4ca92a6fb5b9a3f0e2b
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date: Fri Aug 2 13:18:30 2019 -0400
run-tests ensure that ARVADOS_CONFIG is set, refs #15467
Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>
diff --git a/build/run-tests.sh b/build/run-tests.sh
index b19eafa41..113069a33 100755
--- a/build/run-tests.sh
+++ b/build/run-tests.sh
@@ -422,13 +422,6 @@ start_services() {
all_services_stopped=
fail=1
- # Create config if it hasn't been created already. Normally
- # this happens in install_env because there are downstream
- # steps like workbench install which require a valid
- # config.yml, but when invoked with --skip-install that doesn't
- # happen, so make sure to run it here.
- eval $(python sdk/python/tests/run_test_server.py setup_config)
-
cd "$WORKSPACE" \
&& eval $(python sdk/python/tests/run_test_server.py start --auth admin) \
&& export ARVADOS_TEST_API_HOST="$ARVADOS_API_HOST" \
@@ -664,11 +657,6 @@ install_env() {
pip install --no-cache-dir PyYAML \
|| fatal "pip install PyYAML failed"
- # Create config file. The run_test_server script requires PyYAML,
- # so virtualenv needs to be active. Downstream steps like
- # workbench install which require a valid config.yml.
- eval $(python sdk/python/tests/run_test_server.py setup_config)
-
# Preinstall libcloud if using a fork; otherwise nodemanager "pip
# install" won't pick it up by default.
if [[ -n "$LIBCLOUD_PIN_SRC" ]]; then
@@ -724,6 +712,8 @@ retry() {
}
do_test() {
+ check_arvados_config "$1"
+
case "${1}" in
apps/workbench_units | apps/workbench_functionals | apps/workbench_integration)
suite=apps/workbench
@@ -828,7 +818,22 @@ do_test_once() {
return $result
}
+check_arvados_config() {
+ if [[ -z "$ARVADOS_CONFIG" ]] ; then
+ # Create config file. The run_test_server script requires PyYAML,
+ # so virtualenv needs to be active. Downstream steps like
+ # workbench install which require a valid config.yml.
+ if [[ (! -s "$VENVDIR/bin/activate") && "$1" != "env" ]] ; then
+ install_env
+ fi
+ . "$VENVDIR/bin/activate"
+ eval $(python sdk/python/tests/run_test_server.py setup_config)
+ deactivate
+ fi
+}
+
do_install() {
+ check_arvados_config "$1"
if [[ -n "${skip[install]}" || ( -n "${only_install}" && "${only_install}" != "${1}" && "${only_install}" != "${2}" ) ]]; then
return 0
fi
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list