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 213fce32f5f646f887dffb5dccf01b8a14950ea8..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
@@
-168,8
+173,8
@@
sanity_checks() {
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"
@@
-446,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"
@@
-565,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
@@
-759,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
@@
-785,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
@@
-849,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}