projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
18713: Merge branch 'main' into 18713-nvidia-persistenced
[arvados.git]
/
build
/
run-tests.sh
diff --git
a/build/run-tests.sh
b/build/run-tests.sh
index 32d4a75d2b63bdd04811f78718a60a65de1c74c8..9cd38784b96ec9ad2949da343950f5d5e9961597 100755
(executable)
--- a/
build/run-tests.sh
+++ b/
build/run-tests.sh
@@
-3,8
+3,6
@@
#
# SPDX-License-Identifier: AGPL-3.0
#
# SPDX-License-Identifier: AGPL-3.0
-. `dirname "$(readlink -f "$0")"`/libcloud-pin.sh
-
COLUMNS=80
. `dirname "$(readlink -f "$0")"`/run-library.sh
COLUMNS=80
. `dirname "$(readlink -f "$0")"`/run-library.sh
@@
-88,7
+86,7
@@
lib/cloud/cloudtest
lib/dispatchcloud
lib/dispatchcloud/container
lib/dispatchcloud/scheduler
lib/dispatchcloud
lib/dispatchcloud/container
lib/dispatchcloud/scheduler
-lib/dispatchcloud/ssh
_
executor
+lib/dispatchcloud/sshexecutor
lib/dispatchcloud/worker
lib/mount
lib/pam
lib/dispatchcloud/worker
lib/mount
lib/pam
@@
-244,7
+242,7
@@
sanity_checks() {
|| fatal "No gitolite. Try: apt-get install gitolite3"
echo -n 'npm: '
npm --version \
|| fatal "No gitolite. Try: apt-get install gitolite3"
echo -n 'npm: '
npm --version \
- || fatal "No npm. Try: wget -O- https://nodejs.org/dist/v
6.11.2/node-v6.11.2-linux-x64.tar.xz | sudo tar -C /usr/local -xJf - && sudo ln -s ../node-v6.11.2
-linux-x64/bin/{node,npm} /usr/local/bin/"
+ || fatal "No npm. Try: wget -O- https://nodejs.org/dist/v
10.23.1/node-v10.23.1-linux-x64.tar.xz | sudo tar -C /usr/local -xJf - && sudo ln -s ../node-v10.23.1
-linux-x64/bin/{node,npm} /usr/local/bin/"
echo -n 'cadaver: '
cadaver --version | grep -w cadaver \
|| fatal "No cadaver. Try: apt-get install cadaver"
echo -n 'cadaver: '
cadaver --version | grep -w cadaver \
|| fatal "No cadaver. Try: apt-get install cadaver"
@@
-517,10
+515,10
@@
setup_ruby_environment() {
|| fatal 'rvm gemset setup'
rvm env
|| fatal 'rvm gemset setup'
rvm env
- (bundle version | grep -q 2.
0.2) || gem install bundler -v 2.0.2
+ (bundle version | grep -q 2.
2.19) || gem install --no-document bundler -v 2.2.19
bundle="$(which bundle)"
echo "$bundle"
bundle="$(which bundle)"
echo "$bundle"
- "$bundle" version | grep 2.
0.2
|| fatal 'install bundler'
+ "$bundle" version | grep 2.
2.19
|| fatal 'install bundler'
else
# When our "bundle install"s need to install new gems to
# satisfy dependencies, we want them to go where "gem install
else
# When our "bundle install"s need to install new gems to
# satisfy dependencies, we want them to go where "gem install
@@
-550,10
+548,10
@@
setup_ruby_environment() {
(
export HOME=$GEMHOME
bundlers="$(gem list --details bundler)"
(
export HOME=$GEMHOME
bundlers="$(gem list --details bundler)"
- versions=(
1.11.0 1.17.3 2.0.2
)
+ versions=(
2.2.19
)
for v in ${versions[@]}; do
if ! echo "$bundlers" | fgrep -q "($v)"; then
for v in ${versions[@]}; do
if ! echo "$bundlers" | fgrep -q "($v)"; then
- gem install --user $(for v in ${versions[@]}; do echo bundler:${v}; done)
+ gem install --
no-document --
user $(for v in ${versions[@]}; do echo bundler:${v}; done)
break
fi
done
break
fi
done
@@
-644,7
+642,7
@@
initialize() {
install_env() {
go mod download || fatal "Go deps failed"
install_env() {
go mod download || fatal "Go deps failed"
- which goimports >/dev/null || go
get golang.org/x/tools/cmd/goimports
|| fatal "Go setup failed"
+ which goimports >/dev/null || go
install golang.org/x/tools/cmd/goimports@latest
|| fatal "Go setup failed"
setup_virtualenv "$VENV3DIR"
. "$VENV3DIR/bin/activate"
setup_virtualenv "$VENV3DIR"
. "$VENV3DIR/bin/activate"
@@
-709,7
+707,7
@@
do_test() {
stop_services
check_arvados_config "$1"
;;
stop_services
check_arvados_config "$1"
;;
- gofmt | doc | lib/cli | lib/cloud/azure | lib/cloud/ec2 | lib/cloud/cloudtest | lib/cmd | lib/dispatchcloud/ssh
_
executor | lib/dispatchcloud/worker)
+ gofmt | doc | lib/cli | lib/cloud/azure | lib/cloud/ec2 | lib/cloud/cloudtest | lib/cmd | lib/dispatchcloud/sshexecutor | lib/dispatchcloud/worker)
check_arvados_config "$1"
# don't care whether services are running
;;
check_arvados_config "$1"
# don't care whether services are running
;;
@@
-1082,9
+1080,7
@@
install_deps() {
do_install services/api
do_install services/arv-git-httpd go
do_install services/keepproxy go
do_install services/api
do_install services/arv-git-httpd go
do_install services/keepproxy go
- do_install services/keepstore go
do_install services/keep-web go
do_install services/keep-web go
- do_install services/ws go
}
install_all() {
}
install_all() {
@@
-1147,6
+1143,14
@@
test_all() {
do_test apps/workbench_profile
}
do_test apps/workbench_profile
}
+test_go() {
+ do_test gofmt
+ for g in "${gostuff[@]}"
+ do
+ do_test "$g" go
+ done
+}
+
help_interactive() {
echo "== Interactive commands:"
echo "TARGET (short for 'test DIR')"
help_interactive() {
echo "== Interactive commands:"
echo "TARGET (short for 'test DIR')"