[ARVADOS-DEV] updated: 3d3cee41c54fe3819e03fc0f43023ed715ae694b

[git at public.curoverse.com]

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

       via  3d3cee41c54fe3819e03fc0f43023ed715ae694b (commit)
      from  7490e64759f56a8da52c8259da8b96baa769a6fe (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 3d3cee41c54fe3819e03fc0f43023ed715ae694b
Author: Tom Clegg <tom at curoverse.com>
Date:   Mon Dec 15 14:59:15 2014 -0500

    4156: Uninstall old gems just before building new ones. Avoid an extra source of truth for the "gems we install" list.

diff --git a/jenkins/run-tests.sh b/jenkins/run-tests.sh
index bf7448a..1982d2c 100755
--- a/jenkins/run-tests.sh
+++ b/jenkins/run-tests.sh
@@ -212,13 +212,6 @@ setup_ruby_environment() {
             || fatal 'rvm gemset setup'
 
         rvm env
-
-        # Remove previously installed versions of our own gems. This
-        # ensures the test suites only have access to [a] published
-        # gems and [b] the gems we build and install right now --
-        # never unpublished gems left over from previous builds.
-        gem uninstall --all --executables arvados arvados-cli \
-            || fatal 'clean arvados gems'
     else
         echo "RVM not found. Will install gems-under-test into \"$GEM_HOME\"."
 
@@ -367,6 +360,7 @@ do_install docs
 
 install_ruby_sdk() {
     cd "$WORKSPACE/sdk/ruby" \
+        && with_test_gemset gem uninstall --all --executables arvados \
         && bundle install --no-deployment \
         && gem build arvados.gemspec \
         && with_test_gemset gem install --no-ri --no-rdoc `ls -t arvados-*.gem|head -n1`
@@ -375,6 +369,7 @@ do_install ruby_sdk
 
 install_cli() {
     cd "$WORKSPACE/sdk/cli" \
+        && with_test_gemset gem uninstall --all --executables arvados-cli \
         && bundle install --no-deployment \
         && gem build arvados-cli.gemspec \
         && with_test_gemset gem install --no-ri --no-rdoc `ls -t arvados-cli-*.gem|head -n1`

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


hooks/post-receive
--