projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
18995: Merge branch 'main' into 18995-code-cleanup-5
[arvados.git]
/
build
/
run-tests.sh
diff --git
a/build/run-tests.sh
b/build/run-tests.sh
index 3592efbdc2bee5f6c4e25251677c581dcf65c088..d517e7e2c4d921bbc91d8edd31f1ecfcee9bb881 100755
(executable)
--- a/
build/run-tests.sh
+++ b/
build/run-tests.sh
@@
-40,7
+40,7
@@
sdk/python_test="--test-suite tests.test_keep_locator"
Restrict Python SDK tests to the given class
apps/workbench_test="TEST=test/integration/pipeline_instances_test.rb"
Restrict Workbench tests to the given file
Restrict Python SDK tests to the given class
apps/workbench_test="TEST=test/integration/pipeline_instances_test.rb"
Restrict Workbench tests to the given file
-services/
arv-git-
httpd_test="-check.vv"
+services/
git
httpd_test="-check.vv"
Show all log messages, even when tests pass (also works
with services/keepstore_test etc.)
ARVADOS_DEBUG=1
Show all log messages, even when tests pass (also works
with services/keepstore_test etc.)
ARVADOS_DEBUG=1
@@
-92,7
+92,7
@@
lib/mount
lib/pam
lib/service
services/api
lib/pam
lib/service
services/api
-services/
arv-git-
httpd
+services/
git
httpd
services/crunchstat
services/dockercleaner
services/fuse
services/crunchstat
services/dockercleaner
services/fuse
@@
-410,7
+410,7
@@
start_services() {
return 0
fi
. "$VENV3DIR/bin/activate"
return 0
fi
. "$VENV3DIR/bin/activate"
- echo 'Starting API, controller, keepproxy, keep-web,
arv-git-
httpd, ws, and nginx ssl proxy...'
+ echo 'Starting API, controller, keepproxy, keep-web,
git
httpd, ws, and nginx ssl proxy...'
if [[ ! -d "$WORKSPACE/services/api/log" ]]; then
mkdir -p "$WORKSPACE/services/api/log"
fi
if [[ ! -d "$WORKSPACE/services/api/log" ]]; then
mkdir -p "$WORKSPACE/services/api/log"
fi
@@
-438,8
+438,8
@@
start_services() {
&& python3 sdk/python/tests/run_test_server.py start_keep-web \
&& checkpidfile keep-web \
&& checkhealth WebDAV \
&& python3 sdk/python/tests/run_test_server.py start_keep-web \
&& checkpidfile keep-web \
&& checkhealth WebDAV \
- && python3 sdk/python/tests/run_test_server.py start_
arv-git-
httpd \
- && checkpidfile
arv-git-
httpd \
+ && python3 sdk/python/tests/run_test_server.py start_
git
httpd \
+ && checkpidfile
git
httpd \
&& checkhealth GitHTTP \
&& python3 sdk/python/tests/run_test_server.py start_ws \
&& checkpidfile ws \
&& checkhealth GitHTTP \
&& python3 sdk/python/tests/run_test_server.py start_ws \
&& checkpidfile ws \
@@
-461,7
+461,7
@@
stop_services() {
. "$VENV3DIR/bin/activate" || return
cd "$WORKSPACE" \
&& python3 sdk/python/tests/run_test_server.py stop_nginx \
. "$VENV3DIR/bin/activate" || return
cd "$WORKSPACE" \
&& python3 sdk/python/tests/run_test_server.py stop_nginx \
- && python3 sdk/python/tests/run_test_server.py stop_
arv-git-
httpd \
+ && python3 sdk/python/tests/run_test_server.py stop_
git
httpd \
&& python3 sdk/python/tests/run_test_server.py stop_ws \
&& python3 sdk/python/tests/run_test_server.py stop_keep-web \
&& python3 sdk/python/tests/run_test_server.py stop_keep_proxy \
&& python3 sdk/python/tests/run_test_server.py stop_ws \
&& python3 sdk/python/tests/run_test_server.py stop_keep-web \
&& python3 sdk/python/tests/run_test_server.py stop_keep_proxy \
@@
-556,6
+556,12
@@
setup_ruby_environment() {
done
"$bundle" version | tee /dev/stderr | grep -q 'version 2'
) || fatal 'install bundler'
done
"$bundle" version | tee /dev/stderr | grep -q 'version 2'
) || fatal 'install bundler'
+ if test -d /var/lib/arvados-arvbox/ ; then
+ # Inside arvbox, use bundler-installed binstubs. The
+ # system bundler and rail's own bin/bundle refuse to work.
+ # I don't know why.
+ bundle=binstubs/bundle
+ fi
fi
}
fi
}
@@
-979,7
+985,7
@@
pythonstuff=(
)
declare -a gostuff
)
declare -a gostuff
-gostuff=($(cd "$WORKSPACE" && git
grep -lw func | grep \\.go
| sed -e 's/\/[^\/]*$//' | sort -u))
+gostuff=($(cd "$WORKSPACE" && git
ls-files | grep '\.go$'
| sed -e 's/\/[^\/]*$//' | sort -u))
install_apps/workbench() {
cd "$WORKSPACE/apps/workbench" \
install_apps/workbench() {
cd "$WORKSPACE/apps/workbench" \
@@
-1077,7
+1083,6
@@
install_deps() {
do_install sdk/python pip "${VENV3DIR}/bin/"
do_install sdk/ruby
do_install services/api
do_install sdk/python pip "${VENV3DIR}/bin/"
do_install sdk/ruby
do_install services/api
- do_install services/arv-git-httpd go
do_install services/keepproxy go
do_install services/keep-web go
}
do_install services/keepproxy go
do_install services/keep-web go
}