Install py test deps even if py tests fail. Make docs skippable. No issue #

[arvados-dev.git] / jenkins / run-tests.sh

diff --git a/jenkins/run-tests.sh b/jenkins/run-tests.sh
index 9f0b5e691ed06ad601cb0cb4a5d9ce60876ca2b6..4c5f070c393f6ddb57829bf23d9ee694263387db 100755 (executable)
--- a/jenkins/run-tests.sh
+++ b/jenkins/run-tests.sh
@@ -126,14 +126,14 @@ clear_temp() {
     done
 }
 
-install_docs() {
+test_docs() {
     cd "$WORKSPACE/doc"
     bundle install --deployment
     rm -rf .site
     # Make sure python-epydoc is installed or the next line won't do much good!
     PYTHONPATH=$WORKSPACE/sdk/python/ bundle exec rake generate baseurl=file://$WORKSPACE/doc/.site/ arvados_workbench_host=workbench.$ARVADOS_API_HOST arvados_api_host=$ARVADOS_API_HOST
 }
-do_install docs
+do_test docs
 
 test_doclinkchecker() {
     cd "$WORKSPACE/doc"
@@ -234,16 +234,16 @@ test_python_sdk() {
     # the .egg files that setup.py downloads.
 
     cd "$WORKSPACE/sdk/python" \
-        && python setup.py test \
-        && easy_install *.egg
+        && python setup.py test
+    easy_install *.egg
 }
 do_test python_sdk
 
 test_fuse() {
     # Install test dependencies here too, in case run_test_server needs them.
     cd "$WORKSPACE/services/fuse" \
-        && python setup.py test \
-        && easy_install *.egg
+        && python setup.py test
+    easy_install *.egg
 }
 do_test fuse