From 8b1d2274b5905c34e0f692b1284f61d9270119a7 Mon Sep 17 00:00:00 2001 From: Lucas Di Pentima Date: Tue, 1 Feb 2022 13:09:47 -0300 Subject: [PATCH] 17914: Improves cypress test launch script. Instead of modifying the in-repo config file to point to the correct vocabulary temp path, make a copy of it and pass that to arvados boot. This will avoid committing the arvados_config.yml file by accident. Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima --- tools/run-integration-tests.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/tools/run-integration-tests.sh b/tools/run-integration-tests.sh index bf4c3ba4..6a6177a4 100755 --- a/tools/run-integration-tests.sh +++ b/tools/run-integration-tests.sh @@ -105,12 +105,14 @@ echo "Installing dev dependencies..." ~/go/bin/arvados-server install -type test || exit 1 echo "Launching arvados in test mode..." -VOC_DIR=$(mktemp -d | cut -d \/ -f3) # Removes the /tmp/ part -cp ${VOCABULARY_CONF} /tmp/${VOC_DIR}/voc.json -sed -i "s/VocabularyPath: \".*\"/VocabularyPath: \"\/tmp\/${VOC_DIR}\/voc.json\"/" ${ARVADOS_CONF} +TMPSUBDIR=$(mktemp -d -p /tmp | cut -d \/ -f3) # Removes the /tmp/ part for the regex below +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 \ -type test \ - -config ${ARVADOS_CONF} \ + -config ${TMPDIR}/arvados.yml \ -no-workbench1 \ -own-temporary-database \ -timeout 20m 2> ${ARVADOS_LOG}) -- 2.30.2