[ARVADOS-DEV] updated: e18701a42562461556c3fac9013abf76f29f44fd

[git at public.curoverse.com]

Summary of changes:
 jenkins/run-tests.sh | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

       via  e18701a42562461556c3fac9013abf76f29f44fd (commit)
       via  d8c6d08d57863faf78b2b582950dd8997f83a811 (commit)
      from  264344dc26e402ac477c34f90ef1a8f52dc4ebab (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 e18701a42562461556c3fac9013abf76f29f44fd
Author: Tom Clegg <tom at curoverse.com>
Date:   Tue Jun 30 14:53:47 2015 -0400

    6377: Don't try to uninstall arvados* gems if they are not installed.
    
    Fixes run-tests failure when no Ruby SDK is installed on the test host
    and tmpdirs are new/empty. refs #6377

diff --git a/jenkins/run-tests.sh b/jenkins/run-tests.sh
index fe33948..a646e36 100755
--- a/jenkins/run-tests.sh
+++ b/jenkins/run-tests.sh
@@ -359,7 +359,13 @@ with_test_gemset() {
     if [[ "$using_rvm" == true ]]; then
         "$@"
     else
-        GEM_HOME="$tmpdir_gem_home" "$@"
+        GEM_HOME="$tmpdir_gem_home" GEM_PATH="$tmpdir_gem_home" "$@"
+    fi
+}
+
+gem_uninstall_if_exists() {
+    if gem list "$1\$" | egrep '^\w'; then
+        gem uninstall --force --all --executables "$1"
     fi
 }
 
@@ -535,7 +541,7 @@ install_doc() {
 do_install doc
 
 install_ruby_sdk() {
-    with_test_gemset gem uninstall --force --all --executables arvados \
+    with_test_gemset gem_uninstall_if_exists arvados \
         && cd "$WORKSPACE/sdk/ruby" \
         && bundle_install_trylocal \
         && gem build arvados.gemspec \
@@ -544,7 +550,7 @@ install_ruby_sdk() {
 do_install sdk/ruby ruby_sdk
 
 install_cli() {
-    with_test_gemset gem uninstall --force --all --executables arvados-cli \
+    with_test_gemset gem_uninstall_if_exists arvados-cli \
         && cd "$WORKSPACE/sdk/cli" \
         && bundle_install_trylocal \
         && gem build arvados-cli.gemspec \

commit d8c6d08d57863faf78b2b582950dd8997f83a811
Author: Tom Clegg <tom at curoverse.com>
Date:   Tue Jun 30 14:50:50 2015 -0400

    6377: Create user-specified tmpdirs if necessary. refs #6377

diff --git a/jenkins/run-tests.sh b/jenkins/run-tests.sh
index 38290f7..fe33948 100755
--- a/jenkins/run-tests.sh
+++ b/jenkins/run-tests.sh
@@ -287,8 +287,9 @@ for tmpdir in VENVDIR VENV3DIR GOPATH GEMHOME
 do
     if [[ -n "${!tmpdir}" ]]; then
         leave_temp[$tmpdir]=1
+        mkdir -p "${!tmpdir}"
     else
-        eval $tmpdir=$(mktemp -d)
+        eval "$tmpdir"='$(mktemp -d)'
     fi
 done
 

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


hooks/post-receive
--