[ARVADOS] updated: 1.3.0-636-g91db8ad4b

[Git user]

Summary of changes:
 build/run-tests.sh | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

       via  91db8ad4b1c9c49a8a1b97d0d95a73e9044545f9 (commit)
      from  8ca1a9456e58639bc73120c48373500fe770db65 (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 91db8ad4b1c9c49a8a1b97d0d95a73e9044545f9
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Tue Apr 2 14:18:17 2019 -0400

    Give up if test services don't come up.
    
    refs #15044
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>

diff --git a/build/run-tests.sh b/build/run-tests.sh
index 66eba9961..a37a0f731 100755
--- a/build/run-tests.sh
+++ b/build/run-tests.sh
@@ -403,9 +403,9 @@ start_services() {
 	rm -f "$WORKSPACE/tmp/api.pid"
     fi
     all_services_stopped=
-    fail=0
+    fail=1
     cd "$WORKSPACE" \
-        && eval $(python sdk/python/tests/run_test_server.py start --auth admin || echo "fail=1; false") \
+        && eval $(python sdk/python/tests/run_test_server.py start --auth admin) \
         && export ARVADOS_TEST_API_HOST="$ARVADOS_API_HOST" \
         && export ARVADOS_TEST_API_INSTALLED="$$" \
         && checkpidfile api \
@@ -420,17 +420,13 @@ start_services() {
         && checkpidfile arv-git-httpd \
         && python sdk/python/tests/run_test_server.py start_ws \
         && checkpidfile ws \
-        && eval $(python sdk/python/tests/run_test_server.py start_nginx || echo "fail=1; false") \
+        && eval $(python sdk/python/tests/run_test_server.py start_nginx) \
         && checkdiscoverydoc $ARVADOS_API_HOST \
         && checkpidfile nginx \
         && export ARVADOS_TEST_PROXY_SERVICES=1 \
         && (env | egrep ^ARVADOS) \
-        || fail=1
+        && fail=0
     deactivate
-    if [[ $fail = 0 ]] && ! kill -0 "$(cat "$WORKSPACE/tmp/nginx.pid")"; then
-        echo >&2 "ERROR: nginx seems to have died already"
-        fail=1
-    fi
     if [[ $fail != 0 ]]; then
         unset ARVADOS_TEST_API_HOST
     fi

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


hooks/post-receive
--