[ARVADOS-DEV] updated: 327681d1eee19c941e33beaef75359ea72b0c2f9

git at public.curoverse.com git at public.curoverse.com
Wed Aug 20 15:21:10 EDT 2014


Summary of changes:
 jenkins/run-tests.sh | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

       via  327681d1eee19c941e33beaef75359ea72b0c2f9 (commit)
      from  9336a8a8a11983f28e61db93b9e2262eff793f39 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 327681d1eee19c941e33beaef75359ea72b0c2f9
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Wed Aug 20 15:21:06 2014 -0400

    Unset ARVADOS_ variable from the environment before running tests.  no issue #

diff --git a/jenkins/run-tests.sh b/jenkins/run-tests.sh
index d472965..2e93e3d 100755
--- a/jenkins/run-tests.sh
+++ b/jenkins/run-tests.sh
@@ -11,11 +11,14 @@
 # Regardless of which components are tested, install all components in
 # the usual sequence. (Many test suites depend on other components
 # being installed.)
+#
+#
+# First make sure to remove any ARVADOS_ variables from the calling environment
+# that could interfer with the tests.
+unset $(env | cut -d= -f1 | grep \^ARVADOS_)
 
 COLUMNS=80
 
-ARVADOS_API_HOST=qr1hi.arvadosapi.com
-
 export GOPATH=$(mktemp -d)
 VENVDIR=$(mktemp -d)
 
@@ -131,7 +134,9 @@ test_docs() {
     bundle install --deployment
     rm -rf .site
     # Make sure python-epydoc is installed or the next line won't do much good!
+    ARVADOS_API_HOST=qr1hi.arvadosapi.com
     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
+    unset ARVADOS_API_HOST
 }
 do_test docs
 

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list