projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Set upper version of setuptools for Python 2 support
[arvados.git]
/
build
/
run-tests.sh
diff --git
a/build/run-tests.sh
b/build/run-tests.sh
index 8cf61b9ed37790c509f1e5b888d0d6d4e100c85e..f21861762db80b40535c6d0522a379b12dadca1b 100755
(executable)
--- a/
build/run-tests.sh
+++ b/
build/run-tests.sh
@@
-81,6
+81,7
@@
lib/controller/railsproxy
lib/controller/router
lib/controller/rpc
lib/crunchstat
lib/controller/router
lib/controller/rpc
lib/crunchstat
+lib/crunch-run
lib/cloud
lib/cloud/azure
lib/cloud/cloudtest
lib/cloud
lib/cloud/azure
lib/cloud/cloudtest
@@
-104,7
+105,6
@@
services/keep-balance
services/login-sync
services/nodemanager
services/nodemanager_integration
services/login-sync
services/nodemanager
services/nodemanager_integration
-services/crunch-run
services/crunch-dispatch-local
services/crunch-dispatch-slurm
services/ws
services/crunch-dispatch-local
services/crunch-dispatch-slurm
services/ws
@@
-520,6
+520,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="$(which bundle)"
+ echo "$bundle"
+ "$bundle" version | grep 2.0.2 || 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
@@
-545,9
+549,14
@@
setup_ruby_environment() {
echo "Will install dependencies to $(gem env gemdir)"
echo "Will install arvados gems to $tmpdir_gem_home"
echo "Gem search path is GEM_PATH=$GEM_PATH"
echo "Will install dependencies to $(gem env gemdir)"
echo "Will install arvados gems to $tmpdir_gem_home"
echo "Gem search path is GEM_PATH=$GEM_PATH"
+ bundle="$(gem env gempath | cut -f1 -d:)/bin/bundle"
+ (
+ export HOME=$GEMHOME
+ ("$bundle" version | grep -q 2.0.2) \
+ || gem install --user bundler -v 2.0.2
+ "$bundle" version | grep 2.0.2
+ ) || fatal 'install bundler'
fi
fi
- bundle config || gem install bundler \
- || fatal 'install bundler'
}
with_test_gemset() {
}
with_test_gemset() {
@@
-631,6
+640,7
@@
initialize() {
}
install_env() {
}
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"
setup_virtualenv "$VENVDIR" --python python2.7
which goimports >/dev/null || go get golang.org/x/tools/cmd/goimports || fatal "Go setup failed"
setup_virtualenv "$VENVDIR" --python python2.7
@@
-664,11
+674,6
@@
Warning: python3 could not be found. Python 3 tests will be skipped.
EOF
fi
EOF
fi
-
- if ! which bundler >/dev/null
- then
- gem install --user-install bundler || fatal 'Could not install bundler'
- fi
}
retry() {
}
retry() {
@@
-734,7
+739,7
@@
do_test() {
go_ldflags() {
version=${ARVADOS_VERSION:-$(git log -n1 --format=%H)-dev}
go_ldflags() {
version=${ARVADOS_VERSION:-$(git log -n1 --format=%H)-dev}
- echo "-X git.
curoverse.com
/arvados.git/lib/cmd.version=${version} -X main.version=${version}"
+ echo "-X git.
arvados.org
/arvados.git/lib/cmd.version=${version} -X main.version=${version}"
}
do_test_once() {
}
do_test_once() {
@@
-752,11
+757,11
@@
do_test_once() {
then
covername="coverage-$(echo "$1" | sed -e 's/\//_/g')"
coverflags=("-covermode=count" "-coverprofile=$WORKSPACE/tmp/.$covername.tmp")
then
covername="coverage-$(echo "$1" | sed -e 's/\//_/g')"
coverflags=("-covermode=count" "-coverprofile=$WORKSPACE/tmp/.$covername.tmp")
- # We do "go
get -t
" here to catch compilation errors
+ # We do "go
install
" here to catch compilation errors
# before trying "go test". Otherwise, coverage-reporting
# mode makes Go show the wrong line numbers when reporting
# compilation errors.
# before trying "go test". Otherwise, coverage-reporting
# mode makes Go show the wrong line numbers when reporting
# compilation errors.
- go
get -ldflags "$(go_ldflags)" -t "git.curoverse.com/arvados.git
/$1" && \
+ go
install -ldflags "$(go_ldflags)" "$WORKSPACE
/$1" && \
cd "$WORKSPACE/$1" && \
if [[ -n "${testargs[$1]}" ]]
then
cd "$WORKSPACE/$1" && \
if [[ -n "${testargs[$1]}" ]]
then
@@
-766,7
+771,7
@@
do_test_once() {
else
# The above form gets verbose even when testargs is
# empty, so use this form in such cases:
else
# The above form gets verbose even when testargs is
# empty, so use this form in such cases:
- go test ${short:+-short} ${coverflags[@]} "git.
curoverse.com
/arvados.git/$1"
+ go test ${short:+-short} ${coverflags[@]} "git.
arvados.org
/arvados.git/$1"
fi
result=${result:-$?}
if [[ -f "$WORKSPACE/tmp/.$covername.tmp" ]]
fi
result=${result:-$?}
if [[ -f "$WORKSPACE/tmp/.$covername.tmp" ]]
@@
-844,7
+849,7
@@
do_install_once() {
result=1
elif [[ "$2" == "go" ]]
then
result=1
elif [[ "$2" == "go" ]]
then
- go
get -ldflags "$(go_ldflags)" -t "git.curoverse.com/arvados.git
/$1"
+ go
install -ldflags "$(go_ldflags)" "$WORKSPACE
/$1"
elif [[ "$2" == "pip" ]]
then
# $3 can name a path directory for us to use, including trailing
elif [[ "$2" == "pip" ]]
then
# $3 can name a path directory for us to use, including trailing
@@
-880,11
+885,11
@@
bundle_install_trylocal() {
(
set -e
echo "(Running bundle install --local. 'could not find package' messages are OK.)"
(
set -e
echo "(Running bundle install --local. 'could not find package' messages are OK.)"
- if !
bundle
install --local --no-deployment; then
+ if !
"$bundle"
install --local --no-deployment; then
echo "(Running bundle install again, without --local.)"
echo "(Running bundle install again, without --local.)"
-
bundle
install --no-deployment
+
"$bundle"
install --no-deployment
fi
fi
-
bundle
package --all
+
"$bundle"
package --all
)
}
)
}
@@
-932,7
+937,8
@@
install_services/login-sync() {
install_services/api() {
stop_services
cd "$WORKSPACE/services/api" \
install_services/api() {
stop_services
cd "$WORKSPACE/services/api" \
- && RAILS_ENV=test bundle_install_trylocal
+ && RAILS_ENV=test bundle_install_trylocal \
+ || return 1
rm -f config/environments/test.rb
cp config/environments/test.rb.example config/environments/test.rb
rm -f config/environments/test.rb
cp config/environments/test.rb.example config/environments/test.rb
@@
-968,11
+974,11
@@
install_services/api() {
(cd "$WORKSPACE/services/api"
export RAILS_ENV=test
(cd "$WORKSPACE/services/api"
export RAILS_ENV=test
- if
bundle
exec rails db:environment:set ; then
-
bundle
exec rake db:drop
+ if
"$bundle"
exec rails db:environment:set ; then
+
"$bundle"
exec rake db:drop
fi
fi
-
bundle
exec rake db:setup \
- &&
bundle
exec rake db:fixtures:load
+
"$bundle"
exec rake db:setup \
+ &&
"$bundle"
exec rake db:fixtures:load
)
}
)
}
@@
-998,7
+1004,7
@@
install_apps/workbench() {
cd "$WORKSPACE/apps/workbench" \
&& mkdir -p tmp/cache \
&& RAILS_ENV=test bundle_install_trylocal \
cd "$WORKSPACE/apps/workbench" \
&& mkdir -p tmp/cache \
&& RAILS_ENV=test bundle_install_trylocal \
- && RAILS_ENV=test RAILS_GROUPS=assets
bundle
exec rake npm:install
+ && RAILS_ENV=test RAILS_GROUPS=assets
"$bundle"
exec rake npm:install
}
test_doc() {
}
test_doc() {
@@
-1008,7
+1014,7
@@
test_doc() {
ARVADOS_API_HOST=qr1hi.arvadosapi.com
# Make sure python-epydoc is installed or the next line won't
# do much good!
ARVADOS_API_HOST=qr1hi.arvadosapi.com
# Make sure python-epydoc is installed or the next line won't
# do much good!
- PYTHONPATH=$WORKSPACE/sdk/python/
bundle
exec rake linkchecker baseurl=file://$WORKSPACE/doc/.site/ arvados_workbench_host=https://workbench.$ARVADOS_API_HOST arvados_api_host=$ARVADOS_API_HOST
+ PYTHONPATH=$WORKSPACE/sdk/python/
"$bundle"
exec rake linkchecker baseurl=file://$WORKSPACE/doc/.site/ arvados_workbench_host=https://workbench.$ARVADOS_API_HOST arvados_api_host=$ARVADOS_API_HOST
)
}
)
}
@@
-1021,12
+1027,12
@@
test_gofmt() {
test_services/api() {
rm -f "$WORKSPACE/services/api/git-commit.version"
cd "$WORKSPACE/services/api" \
test_services/api() {
rm -f "$WORKSPACE/services/api/git-commit.version"
cd "$WORKSPACE/services/api" \
- && eval env RAILS_ENV=test ${short:+RAILS_TEST_SHORT=1}
bundle
exec rake test TESTOPTS=\'-v -d\' ${testargs[services/api]}
+ && eval env RAILS_ENV=test ${short:+RAILS_TEST_SHORT=1}
"$bundle"
exec rake test TESTOPTS=\'-v -d\' ${testargs[services/api]}
}
test_sdk/ruby() {
cd "$WORKSPACE/sdk/ruby" \
}
test_sdk/ruby() {
cd "$WORKSPACE/sdk/ruby" \
- &&
bundle
exec rake test TESTOPTS=-v ${testargs[sdk/ruby]}
+ &&
"$bundle"
exec rake test TESTOPTS=-v ${testargs[sdk/ruby]}
}
test_sdk/R() {
}
test_sdk/R() {
@@
-1039,7
+1045,7
@@
test_sdk/R() {
test_sdk/cli() {
cd "$WORKSPACE/sdk/cli" \
&& mkdir -p /tmp/keep \
test_sdk/cli() {
cd "$WORKSPACE/sdk/cli" \
&& mkdir -p /tmp/keep \
- && KEEP_LOCAL_STORE=/tmp/keep
bundle
exec rake test TESTOPTS=-v ${testargs[sdk/cli]}
+ && KEEP_LOCAL_STORE=/tmp/keep
"$bundle"
exec rake test TESTOPTS=-v ${testargs[sdk/cli]}
}
test_sdk/java-v2() {
}
test_sdk/java-v2() {
@@
-1048,7
+1054,7
@@
test_sdk/java-v2() {
test_services/login-sync() {
cd "$WORKSPACE/services/login-sync" \
test_services/login-sync() {
cd "$WORKSPACE/services/login-sync" \
- &&
bundle
exec rake test TESTOPTS=-v ${testargs[services/login-sync]}
+ &&
"$bundle"
exec rake test TESTOPTS=-v ${testargs[services/login-sync]}
}
test_services/nodemanager_integration() {
}
test_services/nodemanager_integration() {
@@
-1059,31
+1065,31
@@
test_services/nodemanager_integration() {
test_apps/workbench_units() {
local TASK="test:units"
cd "$WORKSPACE/apps/workbench" \
test_apps/workbench_units() {
local TASK="test:units"
cd "$WORKSPACE/apps/workbench" \
- && eval env RAILS_ENV=test ${short:+RAILS_TEST_SHORT=1}
bundle
exec rake ${TASK} TESTOPTS=\'-v -d\' ${testargs[apps/workbench]} ${testargs[apps/workbench_units]}
+ && eval env RAILS_ENV=test ${short:+RAILS_TEST_SHORT=1}
"$bundle"
exec rake ${TASK} TESTOPTS=\'-v -d\' ${testargs[apps/workbench]} ${testargs[apps/workbench_units]}
}
test_apps/workbench_functionals() {
local TASK="test:functionals"
cd "$WORKSPACE/apps/workbench" \
}
test_apps/workbench_functionals() {
local TASK="test:functionals"
cd "$WORKSPACE/apps/workbench" \
- && eval env RAILS_ENV=test ${short:+RAILS_TEST_SHORT=1}
bundle
exec rake ${TASK} TESTOPTS=\'-v -d\' ${testargs[apps/workbench]} ${testargs[apps/workbench_functionals]}
+ && eval env RAILS_ENV=test ${short:+RAILS_TEST_SHORT=1}
"$bundle"
exec rake ${TASK} TESTOPTS=\'-v -d\' ${testargs[apps/workbench]} ${testargs[apps/workbench_functionals]}
}
test_apps/workbench_integration() {
local TASK="test:integration"
cd "$WORKSPACE/apps/workbench" \
}
test_apps/workbench_integration() {
local TASK="test:integration"
cd "$WORKSPACE/apps/workbench" \
- && eval env RAILS_ENV=test ${short:+RAILS_TEST_SHORT=1}
bundle
exec rake ${TASK} TESTOPTS=\'-v -d\' ${testargs[apps/workbench]} ${testargs[apps/workbench_integration]}
+ && eval env RAILS_ENV=test ${short:+RAILS_TEST_SHORT=1}
"$bundle"
exec rake ${TASK} TESTOPTS=\'-v -d\' ${testargs[apps/workbench]} ${testargs[apps/workbench_integration]}
}
test_apps/workbench_benchmark() {
local TASK="test:benchmark"
cd "$WORKSPACE/apps/workbench" \
}
test_apps/workbench_benchmark() {
local TASK="test:benchmark"
cd "$WORKSPACE/apps/workbench" \
- && eval env RAILS_ENV=test ${short:+RAILS_TEST_SHORT=1}
bundle
exec rake ${TASK} ${testargs[apps/workbench_benchmark]}
+ && eval env RAILS_ENV=test ${short:+RAILS_TEST_SHORT=1}
"$bundle"
exec rake ${TASK} ${testargs[apps/workbench_benchmark]}
}
test_apps/workbench_profile() {
local TASK="test:profile"
cd "$WORKSPACE/apps/workbench" \
}
test_apps/workbench_profile() {
local TASK="test:profile"
cd "$WORKSPACE/apps/workbench" \
- && eval env RAILS_ENV=test ${short:+RAILS_TEST_SHORT=1}
bundle
exec rake ${TASK} ${testargs[apps/workbench_profile]}
+ && eval env RAILS_ENV=test ${short:+RAILS_TEST_SHORT=1}
"$bundle"
exec rake ${TASK} ${testargs[apps/workbench_profile]}
}
install_deps() {
}
install_deps() {