[ARVADOS-WORKBENCH2] updated: 1.4.1-313-g8831e4dc

[Git user]

Summary of changes:
 Dockerfile => docker/Dockerfile |  0
 tools/run-integration-tests.sh  | 49 +++++++++++++++++++++++++++++++----------
 2 files changed, 37 insertions(+), 12 deletions(-)
 rename Dockerfile => docker/Dockerfile (100%)

       via  8831e4dcad5d21cc86257b70123e542de4afe1b1 (commit)
       via  5b4a300804b3e06f8debc0e12cab01f0704d840d (commit)
      from  9bd1a28a2f55eb435ff808cc118fe4f0b7f94c51 (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 8831e4dcad5d21cc86257b70123e542de4afe1b1
Author: Lucas Di Pentima <lucas at di-pentima.com.ar>
Date:   Mon Apr 20 13:00:27 2020 -0300

    16029: Working on a better way of launching arvados boot. (WIP)
    
    Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas at di-pentima.com.ar>

diff --git a/tools/run-integration-tests.sh b/tools/run-integration-tests.sh
index 0b582e16..250bc48c 100755
--- a/tools/run-integration-tests.sh
+++ b/tools/run-integration-tests.sh
@@ -3,6 +3,15 @@
 #
 # SPDX-License-Identifier: AGPL-3.0
 
+set -e -o pipefail
+
+cleanup_arvboot() {
+    set -x
+    kill ${arvboot_PID} ${consume_stdout_PID}
+    wait ${arvboot_PID} ${consume_stdout_PID} || true
+    echo >&2 "done"
+}
+
 random_free_port() {
     while port=$(shuf -n1 -i $(cat /proc/sys/net/ipv4/ip_local_port_range | tr '\011' '-'))
     netstat -atun | grep -q ":$port\s" ; do
@@ -15,6 +24,7 @@ random_free_port() {
 export NODE_TLS_REJECT_UNAUTHORIZED=0
 
 WORKDIR=`mktemp -d`
+WORKDIR=/tmp/arvboot # For script testing purposes...
 ARVADOS_LOG=${WORKDIR}/arvados.log
 ARVADOS_CONF=`pwd`/tools/arvados_config.yml
 
@@ -26,33 +36,48 @@ fi
 echo "Building & installing arvados-server..."
 cd ${WORKDIR}
 go mod download || exit 1
+cd cmd/arvados-server
+go install
+cd -
 
 echo "Installing dev dependencies..."
-go run ./cmd/arvados-server install -type test || exit 1
+~/go/bin/arvados-server install -type test || exit 1
 
 echo "Running arvados in test mode..."
-ARVADOS_PORT=`random_free_port`
-go run ./cmd/arvados-server boot \
-    -config ${ARVADOS_CONF} \
-    -type test \
-    -own-temporary-database \
-    -controller-address :${ARVADOS_PORT} \
-    -listen-host localhost > ${ARVADOS_LOG} 2>&1 &
+# ARVADOS_PORT=`random_free_port`
+# go run ./cmd/arvados-server boot \
+#     -config ${ARVADOS_CONF} \
+#     -type test \
+#     -own-temporary-database \
+#     -controller-address :${ARVADOS_PORT} \
+#     -listen-host localhost > ${ARVADOS_LOG} 2>&1 &
+coproc arvboot (~/go/bin/arvados-server boot \
+    -type test                      \
+    -config ${ARVADOS_CONF}         \
+    -own-temporary-database         \
+    -timeout 20m)
+trap cleanup_arvboot ERR EXIT
+
+read controllerURL <&"${arvboot[0]}"
+
+# Copy coproc's stdout to stderr, to ensure `arvados-server boot`
+# doesn't get blocked trying to write stdout.
+exec 7<&"${arvbboot[0]}"; coproc consume_stdout (cat <&7 >&2)
 
 cd -
 echo "Running workbench2..."
 WB2_PORT=`random_free_port`
-PORT=${WB2_PORT} REACT_APP_ARVADOS_API_HOST=localhost:${ARVADOS_PORT} \
+PORT=${WB2_PORT} REACT_APP_ARVADOS_API_HOST=${controllerURL} \
     yarn start &
 
 # Wait for arvados & workbench2 to be up.
 # Using https-get to avoid false positive 'ready' detection.
-yarn run wait-on https-get://localhost:${ARVADOS_PORT}/discovery/v1/apis/arvados/v1/rest
-yarn run wait-on https-get://localhost:${WB2_PORT}
+# yarn run wait-on --httpTimeout 300000 https-get://localhost:${ARVADOS_PORT}/discovery/v1/apis/arvados/v1/rest ||
+yarn run wait-on --httpTimeout 300000 https-get://localhost:${WB2_PORT}
 
 echo "Running tests..."
 CYPRESS_system_token=systemusertesttoken1234567890aoeuidhtnsqjkxbmwvzpy \
-    CYPRESS_controller_url=https://localhost:${ARVADOS_PORT} \
+    CYPRESS_controller_url=${controllerURL} \
     CYPRESS_BASE_URL=https://localhost:${WB2_PORT} \
     yarn run cypress run
 TEST_EXIT_CODE=$?

commit 5b4a300804b3e06f8debc0e12cab01f0704d840d
Author: Lucas Di Pentima <lucas at di-pentima.com.ar>
Date:   Fri Apr 17 14:58:22 2020 -0300

    16029: Moves Dockefile to its own subdir.
    
    Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas at di-pentima.com.ar>

diff --git a/Dockerfile b/docker/Dockerfile
similarity index 100%
rename from Dockerfile
rename to docker/Dockerfile

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


hooks/post-receive
--