[ARVADOS] updated: 1.3.0-1409-g3596bdedb

[Git user]

Summary of changes:
 build/run-tests.sh | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

       via  3596bdedbf0a592b3dd4bdcf589c3de7b8913ee1 (commit)
      from  ecbb701177f9ae8713d3e103b3014f10fe584025 (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 3596bdedbf0a592b3dd4bdcf589c3de7b8913ee1
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date:   Mon Jul 29 14:11:11 2019 -0400

    14717: Put setup_config back into install_env, with comments
    
    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 6d73ee990..eb0de9d30 100755
--- a/build/run-tests.sh
+++ b/build/run-tests.sh
@@ -419,7 +419,16 @@ start_services() {
     fi
     all_services_stopped=
     fail=1
-    eval $(python sdk/python/tests/run_test_server.py setup_config)
+
+    if [[ ! -s "$ARVADOS_CONFIG" ]] ; then
+       # 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)
+    fi
+
     cd "$WORKSPACE" \
         && eval $(python sdk/python/tests/run_test_server.py start --auth admin) \
         && export ARVADOS_TEST_API_HOST="$ARVADOS_API_HOST" \
@@ -655,6 +664,11 @@ 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

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


hooks/post-receive
--