projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '12308-cgofuse'
[arvados.git]
/
build
/
run-tests.sh
diff --git
a/build/run-tests.sh
b/build/run-tests.sh
index b32fe6a43f6e5b0b227dc208cb05ba3051cd5a0c..891faca41944469188afebb53f46291a14639e7c 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
@@
-89,6
+90,7
@@
lib/dispatchcloud/container
lib/dispatchcloud/scheduler
lib/dispatchcloud/ssh_executor
lib/dispatchcloud/worker
lib/dispatchcloud/scheduler
lib/dispatchcloud/ssh_executor
lib/dispatchcloud/worker
+lib/mount
lib/service
services/api
services/arv-git-httpd
lib/service
services/api
services/arv-git-httpd
@@
-104,7
+106,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
@@
-647,8
+648,8
@@
install_env() {
. "$VENVDIR/bin/activate"
# Needed for run_test_server.py which is used by certain (non-Python) tests.
. "$VENVDIR/bin/activate"
# Needed for run_test_server.py which is used by certain (non-Python) tests.
- pip install --no-cache-dir PyYAML future \
- || fatal "
pip install PyYAML
failed"
+ pip install --no-cache-dir PyYAML future
httplib2
\
+ || fatal "
`pip install PyYAML future httplib2`
failed"
# Preinstall libcloud if using a fork; otherwise nodemanager "pip
# install" won't pick it up by default.
# Preinstall libcloud if using a fork; otherwise nodemanager "pip
# install" won't pick it up by default.
@@
-739,7
+740,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() {
@@
-771,7
+772,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" ]]
@@
-1099,6
+1100,7
@@
install_deps() {
do_install sdk/cli
do_install sdk/perl
do_install sdk/python pip
do_install sdk/cli
do_install sdk/perl
do_install sdk/python pip
+ do_install sdk/python pip3
do_install sdk/ruby
do_install services/api
do_install services/arv-git-httpd go
do_install sdk/ruby
do_install services/api
do_install services/arv-git-httpd go