[arvados] updated: 2.6.0-4750-g075af058f0

git repository hosting git at public.arvados.org
Thu Aug 24 16:19:34 UTC 2023


Summary of changes:
 services/workbench2/tools/run-integration-tests.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

       via  075af058f0e618c0c7c0e45d6e36b7923b6e78f2 (commit)
      from  6986b1031bdd42a3c30f11c3f4653cdddd3c13e1 (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 075af058f0e618c0c7c0e45d6e36b7923b6e78f2
Author: Tom Clegg <tom at curii.com>
Date:   Thu Aug 24 12:19:18 2023 -0400

    18874: Fix gopath in test script.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --git a/services/workbench2/tools/run-integration-tests.sh b/services/workbench2/tools/run-integration-tests.sh
index 367ccecd35..ad2248ea7e 100755
--- a/services/workbench2/tools/run-integration-tests.sh
+++ b/services/workbench2/tools/run-integration-tests.sh
@@ -102,7 +102,7 @@ go install
 cd -
 
 echo "Installing dev dependencies..."
-~/go/bin/arvados-server install -type test || exit 1
+${GOPATH:-${HOME}/go}/bin/arvados-server install -type test || exit 1
 
 echo "Launching arvados in test mode..."
 TMPSUBDIR=$(mktemp -d -p /tmp | cut -d \/ -f3) # Removes the /tmp/ part for the regex below
@@ -110,7 +110,7 @@ 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 \
     -config ${TMPDIR}/arvados.yml \
     -no-workbench1 \

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list