X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/05c87aaf4572a6420a61e16495420e99ece2cef6..8da39e55beb95fa6f2408c86803e5a003bcd8ae5:/build/run-tests.sh diff --git a/build/run-tests.sh b/build/run-tests.sh index 3cf96f3b4a..0c7909c6ae 100755 --- a/build/run-tests.sh +++ b/build/run-tests.sh @@ -35,8 +35,7 @@ Options: --short Skip (or scale down) some slow tests. --interactive Set up, then prompt for test/install steps to perform. WORKSPACE=path Arvados source tree to test. -CONFIGSRC=path Dir with api server config files to copy into source tree. - (If none given, leave config files alone in source tree.) +CONFIGSRC=path Dir with config.yml file containing PostgreSQL section for use by tests. (required) services/api_test="TEST=test/functional/arvados/v1/collections_controller_test.rb" Restrict apiserver tests to the given file sdk/python_test="--test-suite tests.test_keep_locator" @@ -197,6 +196,10 @@ sanity_checks() { [[ -n "${skip[sanity]}" ]] && return 0 ( [[ -n "$WORKSPACE" ]] && [[ -d "$WORKSPACE/services" ]] ) \ || fatal "WORKSPACE environment variable not set to a source directory (see: $0 --help)" + [[ -n "$CONFIGSRC" ]] \ + || fatal "CONFIGSRC environment not set (see: $0 --help)" + [[ -s "$CONFIGSRC/config.yml" ]] \ + || fatal "'$CONFIGSRC/config.yml' is empty or not found (see: $0 --help)" echo Checking dependencies: echo "locale: ${LANG}" [[ "$(locale charmap)" = "UTF-8" ]] \ @@ -385,12 +388,8 @@ checkpidfile() { checkhealth() { svc="$1" - port="$(cat "$WORKSPACE/tmp/${svc}.port")" - scheme=http - if [[ ${svc} =~ -ssl$ || ${svc} = wss ]]; then - scheme=https - fi - url="$scheme://localhost:${port}/_health/ping" + base=$(python -c "import yaml; print list(yaml.safe_load(file('$ARVADOS_CONFIG'))['Clusters']['zzzzz']['Services']['$1']['InternalURLs'].keys())[0]") + url="$base/_health/ping" if ! curl -Ss -H "Authorization: Bearer e687950a23c3a9bceec28c6223a06c79" "${url}" | tee -a /dev/stderr | grep '"OK"'; then echo "${url} failed" return 1 @@ -422,28 +421,29 @@ start_services() { fi all_services_stopped= fail=1 + cd "$WORKSPACE" \ && eval $(python sdk/python/tests/run_test_server.py start --auth admin) \ && export ARVADOS_TEST_API_HOST="$ARVADOS_API_HOST" \ && export ARVADOS_TEST_API_INSTALLED="$$" \ && checkpidfile api \ && checkdiscoverydoc $ARVADOS_API_HOST \ + && eval $(python sdk/python/tests/run_test_server.py start_nginx) \ + && checkpidfile nginx \ && python sdk/python/tests/run_test_server.py start_controller \ && checkpidfile controller \ - && checkhealth controller \ + && checkhealth Controller \ + && checkdiscoverydoc $ARVADOS_API_HOST \ && python sdk/python/tests/run_test_server.py start_keep_proxy \ && checkpidfile keepproxy \ && python sdk/python/tests/run_test_server.py start_keep-web \ && checkpidfile keep-web \ - && checkhealth keep-web \ + && checkhealth WebDAV \ && python sdk/python/tests/run_test_server.py start_arv-git-httpd \ && checkpidfile arv-git-httpd \ - && checkhealth arv-git-httpd \ + && checkhealth GitHTTP \ && python sdk/python/tests/run_test_server.py start_ws \ && checkpidfile ws \ - && eval $(python sdk/python/tests/run_test_server.py start_nginx) \ - && checkdiscoverydoc $ARVADOS_API_HOST \ - && checkpidfile nginx \ && export ARVADOS_TEST_PROXY_SERVICES=1 \ && (env | egrep ^ARVADOS) \ && fail=0 @@ -579,11 +579,6 @@ initialize() { echo "WORKSPACE=$WORKSPACE" - if [[ -z "$CONFIGSRC" ]] && [[ -d "$HOME/arvados-api-server" ]]; then - # Jenkins expects us to use this by default. - CONFIGSRC="$HOME/arvados-api-server" - fi - # Clean up .pyc files that may exist in the workspace cd "$WORKSPACE" find -name '*.pyc' -delete @@ -627,26 +622,6 @@ initialize() { # whine a lot. setup_ruby_environment - if [[ -s "$CONFIGSRC/config.yml" ]] ; then - cp "$CONFIGSRC/config.yml" "$temp/test-config.yml" - export ARVADOS_CONFIG="$temp/test-config.yml" - else - if [[ -s /etc/arvados/config.yml ]] ; then - python > "$temp/test-config.yml" </dev/null || go get golang.org/x/tools/cmd/goimports ) || fatal "Go setup failed" setup_virtualenv "$VENVDIR" --python python2.7 . "$VENVDIR/bin/activate" # Needed for run_test_server.py which is used by certain (non-Python) tests. - pip install --no-cache-dir PyYAML \ + pip install --no-cache-dir PyYAML future \ || fatal "pip install PyYAML failed" # Preinstall libcloud if using a fork; otherwise nodemanager "pip @@ -736,6 +712,8 @@ retry() { } do_test() { + check_arvados_config "$1" + case "${1}" in apps/workbench_units | apps/workbench_functionals | apps/workbench_integration) suite=apps/workbench @@ -761,6 +739,7 @@ do_test() { ;; *) if ! start_services; then + checkexit 1 "$1 tests" title "test $1 -- failed to start services" return 1 fi @@ -840,7 +819,25 @@ do_test_once() { return $result } +check_arvados_config() { + if [[ "$1" = "env" ]] ; then + return + fi + if [[ -z "$ARVADOS_CONFIG" ]] ; then + # Create config file. The run_test_server script requires PyYAML, + # so virtualenv needs to be active. Downstream steps like + # workbench install which require a valid config.yml. + if [[ ! -s "$VENVDIR/bin/activate" ]] ; then + install_env + fi + . "$VENVDIR/bin/activate" + eval $(python sdk/python/tests/run_test_server.py setup_config) + deactivate + fi +} + do_install() { + check_arvados_config "$1" if [[ -n "${skip[install]}" || ( -n "${only_install}" && "${only_install}" != "${1}" && "${only_install}" != "${2}" ) ]]; then return 0 fi @@ -943,25 +940,18 @@ install_services/login-sync() { } install_services/api() { + stop_services cd "$WORKSPACE/services/api" \ && RAILS_ENV=test bundle_install_trylocal rm -f config/environments/test.rb cp config/environments/test.rb.example config/environments/test.rb - if [ -n "$CONFIGSRC" ] - then - for f in database.yml - do - cp "$CONFIGSRC/$f" config/ || fatal "$f" - done - fi - # Clear out any lingering postgresql connections to the test # database, so that we can drop it. This assumes the current user # is a postgresql superuser. cd "$WORKSPACE/services/api" \ - && test_database=$(python -c "import yaml; print yaml.safe_load(file('config/database.yml'))['test']['database']") \ + && test_database=$(python -c "import yaml; print yaml.safe_load(file('$ARVADOS_CONFIG'))['Clusters']['zzzzz']['PostgreSQL']['Connection']['dbname']") \ && psql "$test_database" -c "SELECT pg_terminate_backend (pg_stat_activity.pid::int) FROM pg_stat_activity WHERE pg_stat_activity.datname = '$test_database';" 2>/dev/null mkdir -p "$WORKSPACE/services/api/tmp/pids" @@ -985,11 +975,15 @@ install_services/api() { && git --git-dir internal.git init \ || return 1 - cd "$WORKSPACE/services/api" \ - && RAILS_ENV=test bundle exec rails db:environment:set \ - && RAILS_ENV=test bundle exec rake db:drop \ - && RAILS_ENV=test bundle exec rake db:setup \ - && RAILS_ENV=test bundle exec rake db:fixtures:load + + (cd "$WORKSPACE/services/api" + export RAILS_ENV=test + if bundle exec rails db:environment:set ; then + bundle exec rake db:drop + fi + bundle exec rake db:setup \ + && bundle exec rake db:fixtures:load + ) } declare -a pythonstuff @@ -1058,7 +1052,7 @@ test_govendor() { test_services/api() { rm -f "$WORKSPACE/services/api/git-commit.version" cd "$WORKSPACE/services/api" \ - && 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() { @@ -1095,47 +1089,32 @@ test_services/nodemanager_integration() { test_apps/workbench_units() { local TASK="test:units" - if [[ -n "${testargs[apps/workbench]}" ]] || [[ -n "${testargs[apps/workbench_units]}" ]]; then - TASK="test" - fi cd "$WORKSPACE/apps/workbench" \ - && 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" - if [[ -n "${testargs[apps/workbench]}" ]] || [[ -n "${testargs[apps/workbench_functionals]}" ]]; then - TASK="test" - fi cd "$WORKSPACE/apps/workbench" \ - && 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" - if [[ -n "${testargs[apps/workbench]}" ]] || [[ -n "${testargs[apps/workbench_integration]}" ]]; then - TASK="test" - fi cd "$WORKSPACE/apps/workbench" \ - && 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" - if [[ -n "${testargs[apps/workbench]}" ]] || [[ -n "${testargs[apps/workbench_benchmark]}" ]]; then - TASK="test" - fi cd "$WORKSPACE/apps/workbench" \ - && 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" - if [[ -n "${testargs[apps/workbench]}" ]] || [[ -n "${testargs[apps/workbench_profile]}" ]]; then - TASK="test" - fi cd "$WORKSPACE/apps/workbench" \ - && 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() {