18874: Fix arvados-boot source dir.

[arvados.git] / services / workbench2 / tools / run-integration-tests.sh

diff --git a/services/workbench2/tools/run-integration-tests.sh b/services/workbench2/tools/run-integration-tests.sh
index 367ccecd3512d90f261adc30b85405aac3f6176a..68d9e357604324f2d717bb7b481d9db48bc2e5fb 100755 (executable)
--- a/services/workbench2/tools/run-integration-tests.sh
+++ b/services/workbench2/tools/run-integration-tests.sh
@@ -94,15 +94,17 @@ if [ ! -d "${ARVADOS_DIR}/.git" ]; then
     git clone https://git.arvados.org/arvados.git ${ARVADOS_DIR} || exit 1
 fi
 
-echo "Building & installing arvados-server..."
-cd ${ARVADOS_DIR}
-go mod download || exit 1
-cd cmd/arvados-server
-go install
-cd -
-
-echo "Installing dev dependencies..."
-~/go/bin/arvados-server install -type test || exit 1
+if [ ! -x ${GOPATH:-${HOME}/go}/bin/arvados-server ]; then
+    echo "Building & installing arvados-server..."
+    cd ${ARVADOS_DIR}
+    go mod download || exit 1
+    cd cmd/arvados-server
+    go install
+    cd -
+
+    echo "Installing dev dependencies..."
+    ${GOPATH:-${HOME}/go}/bin/arvados-server install -type test || exit 1
+fi
 
 echo "Launching arvados in test mode..."
 TMPSUBDIR=$(mktemp -d -p /tmp | cut -d \/ -f3) # Removes the /tmp/ part for the regex below
@@ -110,8 +112,9 @@ TMPDIR=/tmp/${TMPSUBDIR}
 cp ${VOCABULARY_CONF} ${TMPDIR}/voc.json
 cp ${ARVADOS_CONF} ${TMPDIR}/arvados.yml
 sed -i "s/VocabularyPath: \".*\"/VocabularyPath: \"\/tmp\/${TMPSUBDIR}\/voc.json\"/" ${TMPDIR}/arvados.yml
-coproc arvboot (~/go/bin/arvados-server boot \
+coproc arvboot (${GOPATH:-${HOME}/go}/bin/arvados-server boot \
     -type test \
+    -source "${ARVADOS_DIR}" \
     -config ${TMPDIR}/arvados.yml \
     -no-workbench1 \
     -no-workbench2 \