projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
11158: Fixes & test updates for ProjectDirectory.
[arvados.git]
/
build
/
run-tests.sh
diff --git
a/build/run-tests.sh
b/build/run-tests.sh
index 32432f8986de98d7dde6728b9d2fd8afbdf60799..3952b36604102cf6f3fd78fceb95eac915d8c2d4 100755
(executable)
--- a/
build/run-tests.sh
+++ b/
build/run-tests.sh
@@
-1,6
+1,9
@@
#!/bin/bash
#!/bin/bash
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
-. `dirname "$(readlink -f "$0")"`/libcloud-pin
+. `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
@@
-78,6
+81,7
@@
services/keepstore
services/keep-balance
services/login-sync
services/nodemanager
services/keep-balance
services/login-sync
services/nodemanager
+services/nodemanager-integration
services/crunch-run
services/crunch-dispatch-local
services/crunch-dispatch-slurm
services/crunch-run
services/crunch-dispatch-local
services/crunch-dispatch-slurm
@@
-91,6
+95,7
@@
sdk/go/arvados
sdk/go/arvadosclient
sdk/go/dispatch
sdk/go/keepclient
sdk/go/arvadosclient
sdk/go/dispatch
sdk/go/keepclient
+sdk/go/health
sdk/go/httpserver
sdk/go/manifest
sdk/go/blockdigest
sdk/go/httpserver
sdk/go/manifest
sdk/go/blockdigest
@@
-165,14
+170,11
@@
sanity_checks() {
echo -n 'ruby: '
ruby -v \
|| fatal "No ruby. Install >=2.1.9 (using rbenv, rvm, or source)"
echo -n 'ruby: '
ruby -v \
|| fatal "No ruby. Install >=2.1.9 (using rbenv, rvm, or source)"
- echo -n 'bundler: '
- bundle version \
- || fatal "No bundler. Try: gem install bundler"
echo -n 'go: '
go version \
|| fatal "No go binary. See http://golang.org/doc/install"
echo -n 'go: '
go version \
|| fatal "No go binary. See http://golang.org/doc/install"
- [[ $(go version) =~ go1.([0-9]+) ]] && [[ ${BASH_REMATCH[1]} -ge
7
]] \
- || fatal "Go >= 1.
7
required. See http://golang.org/doc/install"
+ [[ $(go version) =~ go1.([0-9]+) ]] && [[ ${BASH_REMATCH[1]} -ge
8
]] \
+ || fatal "Go >= 1.
8
required. See http://golang.org/doc/install"
echo -n 'gcc: '
gcc --version | egrep ^gcc \
|| fatal "No gcc. Try: apt-get install build-essential"
echo -n 'gcc: '
gcc --version | egrep ^gcc \
|| fatal "No gcc. Try: apt-get install build-essential"
@@
-348,13
+350,13
@@
done
setup_ruby_environment() {
if [[ -s "$HOME/.rvm/scripts/rvm" ]] ; then
setup_ruby_environment() {
if [[ -s "$HOME/.rvm/scripts/rvm" ]] ; then
- source "$HOME/.rvm/scripts/rvm"
- using_rvm=true
+
source "$HOME/.rvm/scripts/rvm"
+
using_rvm=true
elif [[ -s "/usr/local/rvm/scripts/rvm" ]] ; then
elif [[ -s "/usr/local/rvm/scripts/rvm" ]] ; then
- source "/usr/local/rvm/scripts/rvm"
- using_rvm=true
+
source "/usr/local/rvm/scripts/rvm"
+
using_rvm=true
else
else
- using_rvm=false
+
using_rvm=false
fi
if [[ "$using_rvm" == true ]]; then
fi
if [[ "$using_rvm" == true ]]; then
@@
-403,12
+405,14
@@
setup_ruby_environment() {
tmpdir_gem_home="$(env - PATH="$PATH" HOME="$GEMHOME" gem env gempath | cut -f1 -d:)"
PATH="$tmpdir_gem_home/bin:$PATH"
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
:$(gem env gempath)
"
+ export GEM_PATH="$tmpdir_gem_home"
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"
fi
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"
fi
+ bundle config || gem install bundler \
+ || fatal 'install bundler'
}
with_test_gemset() {
}
with_test_gemset() {
@@
-447,6
+451,8
@@
export GOPATH
mkdir -p "$GOPATH/src/git.curoverse.com"
ln -sfT "$WORKSPACE" "$GOPATH/src/git.curoverse.com/arvados.git" \
|| fatal "symlink failed"
mkdir -p "$GOPATH/src/git.curoverse.com"
ln -sfT "$WORKSPACE" "$GOPATH/src/git.curoverse.com/arvados.git" \
|| fatal "symlink failed"
+go get -v github.com/kardianos/govendor \
+ || fatal "govendor install failed"
setup_virtualenv "$VENVDIR" --python python2.7
. "$VENVDIR/bin/activate"
setup_virtualenv "$VENVDIR" --python python2.7
. "$VENVDIR/bin/activate"
@@
-566,7
+572,7
@@
do_test_once() {
# mode makes Go show the wrong line numbers when reporting
# compilation errors.
go get -t "git.curoverse.com/arvados.git/$1" && \
# mode makes Go show the wrong line numbers when reporting
# compilation errors.
go get -t "git.curoverse.com/arvados.git/$1" && \
- cd "$
WORKSPACE
/$1" && \
+ cd "$
GOPATH/src/git.curoverse.com/arvados.git
/$1" && \
[[ -z "$(gofmt -e -d . | tee /dev/stderr)" ]] && \
if [[ -n "${testargs[$1]}" ]]
then
[[ -z "$(gofmt -e -d . | tee /dev/stderr)" ]] && \
if [[ -n "${testargs[$1]}" ]]
then
@@
-760,12
+766,16
@@
install_apiserver() {
}
do_install services/api apiserver
}
do_install services/api apiserver
+cd "$GOPATH/src/git.curoverse.com/arvados.git" && \
+ "$GOPATH/bin/govendor" sync -v || \
+ fatal "govendor sync failed"
declare -a gostuff
gostuff=(
sdk/go/arvados
sdk/go/arvadosclient
sdk/go/blockdigest
sdk/go/dispatch
declare -a gostuff
gostuff=(
sdk/go/arvados
sdk/go/arvadosclient
sdk/go/blockdigest
sdk/go/dispatch
+ sdk/go/health
sdk/go/httpserver
sdk/go/manifest
sdk/go/streamer
sdk/go/httpserver
sdk/go/manifest
sdk/go/streamer
@@
-786,7
+796,7
@@
gostuff=(
tools/keep-block-check
tools/keep-exercise
tools/keep-rsync
tools/keep-block-check
tools/keep-exercise
tools/keep-rsync
-
)
+)
for g in "${gostuff[@]}"
do
do_install "$g" go
for g in "${gostuff[@]}"
do
do_install "$g" go
@@
-829,7
+839,7
@@
if [ ! -z "$only" ] && [ "$only" == "services/api" ]; then
exit_cleanly
fi
exit_cleanly
fi
-start_api
+start_api
|| { stop_services; fatal "start_api"; }
test_ruby_sdk() {
cd "$WORKSPACE/sdk/ruby" \
test_ruby_sdk() {
cd "$WORKSPACE/sdk/ruby" \
@@
-850,6
+860,12
@@
test_login-sync() {
}
do_test services/login-sync login-sync
}
do_test services/login-sync login-sync
+test_nodemanager-integration() {
+ cd "$WORKSPACE/services/nodemanager" \
+ && tests/integration_test.py ${testargs[services/nodemanager-integration]}
+}
+do_test services/nodemanager-integration nodemanager-integration
+
for p in "${pythonstuff[@]}"
do
dir=${p%:py3}
for p in "${pythonstuff[@]}"
do
dir=${p%:py3}