From: Tom Clegg <tclegg@veritasgenetics.com>
Date: Fri, 26 Jul 2019 20:00:31 +0000 (-0400)
Subject: 14717: Write config file before starting test services.
X-Git-Tag: 2.0.0~241^2~9
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/639789ffd0d7a3271789b3ba45604a65cba92928?ds=sidebyside

14717: Write config file before starting test services.

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg@veritasgenetics.com>
---

diff --git a/build/run-tests.sh b/build/run-tests.sh
index 0e38b484e4..9bcbe4d93b 100755
--- a/build/run-tests.sh
+++ b/build/run-tests.sh
@@ -418,6 +418,7 @@ start_services() {
     fi
     all_services_stopped=
     fail=1
+    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" \
@@ -658,8 +659,6 @@ install_env() {
     pip install --no-cache-dir PyYAML \
         || fatal "pip install PyYAML failed"
 
-    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