[ARVADOS-DEV] updated: c479436a110f977879ff278e9a550efe47f26e1d

[git at public.curoverse.com]

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

  discards  3d3cee41c54fe3819e03fc0f43023ed715ae694b (commit)
       via  c479436a110f977879ff278e9a550efe47f26e1d (commit)

This update added new revisions after undoing existing revisions.  That is
to say, the old revision is not a strict subset of the new revision.  This
situation occurs when you --force push a change and generate a repository
containing something like this:

 * -- * -- B -- O -- O -- O (3d3cee41c54fe3819e03fc0f43023ed715ae694b)
            \
             N -- N -- N (c479436a110f977879ff278e9a550efe47f26e1d)

When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.

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 c479436a110f977879ff278e9a550efe47f26e1d
Author: Tom Clegg <tom at curoverse.com>
Date:   Mon Dec 15 15:38:41 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..6682c0d 100755
--- a/jenkins/run-tests.sh
+++ b/jenkins/run-tests.sh
@@ -212,16 +212,7 @@ 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\"."
-
         # When our "bundle install"s need to install new gems to
         # satisfy dependencies, we want them to go where "gem install
         # --user-install" would put them. (However, if the caller has
@@ -366,7 +357,8 @@ install_docs() {
 do_install docs
 
 install_ruby_sdk() {
-    cd "$WORKSPACE/sdk/ruby" \
+    with_test_gemset gem uninstall --all --executables arvados \
+        && cd "$WORKSPACE/sdk/ruby" \
         && bundle install --no-deployment \
         && gem build arvados.gemspec \
         && with_test_gemset gem install --no-ri --no-rdoc `ls -t arvados-*.gem|head -n1`
@@ -374,7 +366,8 @@ install_ruby_sdk() {
 do_install ruby_sdk
 
 install_cli() {
-    cd "$WORKSPACE/sdk/cli" \
+    with_test_gemset gem uninstall --all --executables arvados-cli \
+        && cd "$WORKSPACE/sdk/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
--