X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/4cfab58ae5b052884e1a42277a45aab23f3b1798..afec9ddba0b865918815ca3345278decc1fc6697:/build/run-tests.sh diff --git a/build/run-tests.sh b/build/run-tests.sh index 757f6182c0..3592efbdc2 100755 --- a/build/run-tests.sh +++ b/build/run-tests.sh @@ -3,8 +3,6 @@ # # SPDX-License-Identifier: AGPL-3.0 -. `dirname "$(readlink -f "$0")"`/libcloud-pin.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/ssh_executor +lib/dispatchcloud/sshexecutor lib/dispatchcloud/worker lib/mount lib/pam @@ -162,9 +160,12 @@ temp_preserve= clear_temp() { if [[ -z "$temp" ]]; then - # we didn't even get as far as making a temp dir + # we did not even get as far as making a temp dir : elif [[ -z "$temp_preserve" ]]; then + # Go creates readonly dirs in the module cache, which cause + # "rm -rf" to fail unless we chmod first. + chmod -R u+w "$temp" rm -rf "$temp" else echo "Leaving behind temp dirs in $temp" @@ -241,7 +242,7 @@ sanity_checks() { || fatal "No gitolite. Try: apt-get install gitolite3" echo -n 'npm: ' npm --version \ - || fatal "No npm. Try: wget -O- https://nodejs.org/dist/v6.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/v10.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" @@ -514,10 +515,10 @@ setup_ruby_environment() { || 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" 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 @@ -538,19 +539,18 @@ setup_ruby_environment() { tmpdir_gem_home="$(env - PATH="$PATH" HOME="$GEMHOME" gem env gempath | cut -f1 -d:)" PATH="$tmpdir_gem_home/bin:$PATH" - export GEM_PATH="$tmpdir_gem_home" + export GEM_PATH="$tmpdir_gem_home:$(gem env gempath)" echo "Will install dependencies to $(gem env gemdir)" - echo "Will install arvados gems to $tmpdir_gem_home" + echo "Will install bundler and arvados gems to $tmpdir_gem_home" echo "Gem search path is GEM_PATH=$GEM_PATH" - bundle="$(gem env gempath | cut -f1 -d:)/bin/bundle" + bundle="bundle" ( 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 - gem install --user $(for v in ${versions[@]}; do echo bundler:${v}; done) + if ! gem list --installed --version "${v}" bundler >/dev/null; then + gem install --no-document --user $(for v in ${versions[@]}; do echo bundler:${v}; done) break fi done @@ -641,12 +641,13 @@ initialize() { 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" # Needed for run_test_server.py which is used by certain (non-Python) tests. + # pdoc3 needed to generate the Python SDK documentation. ( set -e "${VENV3DIR}/bin/pip3" install wheel @@ -657,6 +658,7 @@ install_env() { "${VENV3DIR}/bin/pip3" install ciso8601 "${VENV3DIR}/bin/pip3" install pycurl "${VENV3DIR}/bin/pip3" install ws4py + "${VENV3DIR}/bin/pip3" install pdoc3 cd "$WORKSPACE/sdk/python" python3 setup.py install ) || fatal "installing PyYAML and sdk/python failed" @@ -704,7 +706,7 @@ do_test() { 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 ;; @@ -959,11 +961,11 @@ install_services/api() { set -ex cd "$WORKSPACE/services/api" export RAILS_ENV=test - if "$bundle" exec rails db:environment:set ; then - "$bundle" exec rake db:drop + if bin/rails db:environment:set ; then + bin/rake db:drop fi - "$bundle" exec rake db:setup - "$bundle" exec rake db:fixtures:load + bin/rake db:setup + bin/rake db:fixtures:load ) || return 1 } @@ -990,7 +992,7 @@ test_doc() { ( set -e cd "$WORKSPACE/doc" - ARVADOS_API_HOST=qr1hi.arvadosapi.com + ARVADOS_API_HOST=pirca.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 @@ -1077,9 +1079,7 @@ install_deps() { 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/ws go } install_all() { @@ -1142,6 +1142,14 @@ test_all() { 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')"