projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '20862-google-api-client'
[arvados.git]
/
build
/
run-tests.sh
diff --git
a/build/run-tests.sh
b/build/run-tests.sh
index a5c7277580496cd1fe4748aed040ce2261bd3e95..481f0c33ab6523b72ed18e82cff5d61897b4d2d7 100755
(executable)
--- a/
build/run-tests.sh
+++ b/
build/run-tests.sh
@@
-94,7
+94,6
@@
lib/pam
lib/service
services/api
services/githttpd
lib/service
services/api
services/githttpd
-services/crunchstat
services/dockercleaner
services/fuse
services/fuse:py3
services/dockercleaner
services/fuse
services/fuse:py3
@@
-110,6
+109,7
@@
services/ws
sdk/cli
sdk/python
sdk/python:py3
sdk/cli
sdk/python
sdk/python:py3
+sdk/ruby-google-api-client
sdk/ruby
sdk/go/arvados
sdk/go/arvadosclient
sdk/ruby
sdk/go/arvados
sdk/go/arvadosclient
@@
-654,7
+654,7
@@
install_env() {
. "$VENV3DIR/bin/activate"
# Needed for run_test_server.py which is used by certain (non-Python) tests.
. "$VENV3DIR/bin/activate"
# Needed for run_test_server.py which is used by certain (non-Python) tests.
- # pdoc
3
needed to generate the Python SDK documentation.
+ # pdoc needed to generate the Python SDK documentation.
(
set -e
"${VENV3DIR}/bin/pip3" install wheel
(
set -e
"${VENV3DIR}/bin/pip3" install wheel
@@
-665,7
+665,7
@@
install_env() {
"${VENV3DIR}/bin/pip3" install ciso8601
"${VENV3DIR}/bin/pip3" install pycurl
"${VENV3DIR}/bin/pip3" install ws4py
"${VENV3DIR}/bin/pip3" install ciso8601
"${VENV3DIR}/bin/pip3" install pycurl
"${VENV3DIR}/bin/pip3" install ws4py
- "${VENV3DIR}/bin/pip3" install pdoc
3
+ "${VENV3DIR}/bin/pip3" install pdoc
cd "$WORKSPACE/sdk/python"
python3 setup.py install
) || fatal "installing PyYAML and sdk/python failed"
cd "$WORKSPACE/sdk/python"
python3 setup.py install
) || fatal "installing PyYAML and sdk/python failed"
@@
-909,6
+909,10
@@
install_sdk/ruby() {
install_gem arvados sdk/ruby
}
install_gem arvados sdk/ruby
}
+install_sdk/ruby-google-api-client() {
+ install_gem arvados-google-api-client sdk/ruby-google-api-client
+}
+
install_sdk/R() {
if [[ "$NEED_SDK_R" = true ]]; then
cd "$WORKSPACE/sdk/R" \
install_sdk/R() {
if [[ "$NEED_SDK_R" = true ]]; then
cd "$WORKSPACE/sdk/R" \
@@
-921,6
+925,7
@@
install_sdk/cli() {
}
install_services/login-sync() {
}
install_services/login-sync() {
+ install_gem arvados-google-api-client sdk/ruby-google-api-client
install_gem arvados sdk/ruby
install_gem arvados-login-sync services/login-sync
}
install_gem arvados sdk/ruby
install_gem arvados-login-sync services/login-sync
}
@@
-1022,6
+1027,11
@@
test_sdk/ruby() {
&& "$bundle" exec rake test TESTOPTS=-v ${testargs[sdk/ruby]}
}
&& "$bundle" exec rake test TESTOPTS=-v ${testargs[sdk/ruby]}
}
+test_sdk/ruby-google-api-client() {
+ echo "*** note \`test sdk/ruby-google-api-client\` does not actually run any tests, see https://dev.arvados.org/issues/20993 ***"
+ true
+}
+
test_sdk/R() {
if [[ "$NEED_SDK_R" = true ]]; then
cd "$WORKSPACE/sdk/R" \
test_sdk/R() {
if [[ "$NEED_SDK_R" = true ]]; then
cd "$WORKSPACE/sdk/R" \
@@
-1080,6
+1090,7
@@
install_deps() {
do_install cmd/arvados-server go
do_install sdk/cli
do_install sdk/python pip "${VENV3DIR}/bin/"
do_install cmd/arvados-server go
do_install sdk/cli
do_install sdk/python pip "${VENV3DIR}/bin/"
+ do_install sdk/ruby-google-api-client
do_install sdk/ruby
do_install services/api
do_install services/keepproxy go
do_install sdk/ruby
do_install services/api
do_install services/keepproxy go
@@
-1089,6
+1100,7
@@
install_deps() {
install_all() {
do_install env
do_install doc
install_all() {
do_install env
do_install doc
+ do_install sdk/ruby-google-api-client
do_install sdk/ruby
do_install sdk/R
do_install sdk/cli
do_install sdk/ruby
do_install sdk/R
do_install sdk/cli
@@
-1121,6
+1133,7
@@
test_all() {
do_test gofmt
do_test doc
do_test gofmt
do_test doc
+ do_test sdk/ruby-google-api-client
do_test sdk/ruby
do_test sdk/R
do_test sdk/cli
do_test sdk/ruby
do_test sdk/R
do_test sdk/cli