projects
/
arvados-workbench2.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update version-at-commit.sh refs #17512
[arvados-workbench2.git]
/
tools
/
run-integration-tests.sh
diff --git
a/tools/run-integration-tests.sh
b/tools/run-integration-tests.sh
index 140de3c8ad2fcbcf9c7bce5ba0e7d7c91bfe8c77..159bfc1cb3abf5439adc94a3141e0738718ca3e2 100755
(executable)
--- a/
tools/run-integration-tests.sh
+++ b/
tools/run-integration-tests.sh
@@
-10,7
+10,7
@@
cleanup() {
set +e +o pipefail
kill ${arvboot_PID} ${consume_stdout_PID} ${wb2_PID} ${consume_wb2_stdout_PID}
wait ${arvboot_PID} ${consume_stdout_PID} ${wb2_PID} ${consume_wb2_stdout_PID} || true
set +e +o pipefail
kill ${arvboot_PID} ${consume_stdout_PID} ${wb2_PID} ${consume_wb2_stdout_PID}
wait ${arvboot_PID} ${consume_stdout_PID} ${wb2_PID} ${consume_wb2_stdout_PID} || true
- if [
"${CLEANUP_ARVADOS_DIR}" -eq "1"
]; then
+ if [
${CLEANUP_ARVADOS_DIR} -eq 1
]; then
rm -rf ${ARVADOS_DIR}
fi
echo >&2 "done"
rm -rf ${ARVADOS_DIR}
fi
echo >&2 "done"
@@
-36,9
+36,9
@@
usage() {
# Allow self-signed certs on 'wait-on'
export NODE_TLS_REJECT_UNAUTHORIZED=0
# Allow self-signed certs on 'wait-on'
export NODE_TLS_REJECT_UNAUTHORIZED=0
+ARVADOS_DIR="unset"
CLEANUP_ARVADOS_DIR=0
CYPRESS_MODE="run"
CLEANUP_ARVADOS_DIR=0
CYPRESS_MODE="run"
-ARVADOS_DIR=`mktemp -d`
WB2_DIR=`pwd`
while getopts "ia:w:" o; do
WB2_DIR=`pwd`
while getopts "ia:w:" o; do
@@
-61,6
+61,13
@@
while getopts "ia:w:" o; do
done
shift $((OPTIND-1))
done
shift $((OPTIND-1))
+if [ "${ARVADOS_DIR}" = "unset" ]; then
+ echo "ARVADOS_DIR is unset, creating a temporary directory for new checkout"
+ ARVADOS_DIR=`mktemp -d`
+fi
+
+echo "ARVADOS_DIR is ${ARVADOS_DIR}"
+
ARVADOS_LOG=${ARVADOS_DIR}/arvados.log
ARVADOS_CONF=${WB2_DIR}/tools/arvados_config.yml
ARVADOS_LOG=${ARVADOS_DIR}/arvados.log
ARVADOS_CONF=${WB2_DIR}/tools/arvados_config.yml
@@
-100,6
+107,7
@@
echo "Launching arvados in test mode..."
coproc arvboot (~/go/bin/arvados-server boot \
-type test \
-config ${ARVADOS_CONF} \
coproc arvboot (~/go/bin/arvados-server boot \
-type test \
-config ${ARVADOS_CONF} \
+ -no-workbench1 \
-own-temporary-database \
-timeout 20m 2> ${ARVADOS_LOG})
trap cleanup ERR EXIT
-own-temporary-database \
-timeout 20m 2> ${ARVADOS_LOG})
trap cleanup ERR EXIT