[ARVADOS-DEV] updated: 7490e64759f56a8da52c8259da8b96baa769a6fe

[git at public.curoverse.com]

Summary of changes:
 jenkins/run-tests.sh | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

       via  7490e64759f56a8da52c8259da8b96baa769a6fe (commit)
       via  2fb06b518ef7c6f402d7d8832577400a0814dab0 (commit)
       via  061a0fa3af58c1c1db584e21cb069547288f7e82 (commit)
       via  511d0877b038c3ce33f3fcfa72def70f7da84692 (commit)
       via  8c7f4b71ffe3976dca29a8337e3d487ad7547096 (commit)
      from  8bfa3e75783933f7a9e484b18074336456fbc834 (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 7490e64759f56a8da52c8259da8b96baa769a6fe
Author: Tom Clegg <tom at curoverse.com>
Date:   Mon Dec 15 14:53:56 2014 -0500

    4156: Update comments, remove excess cut, tweak GEM_HOME-reporting.

diff --git a/jenkins/run-tests.sh b/jenkins/run-tests.sh
index ede7302..bf7448a 100755
--- a/jenkins/run-tests.sh
+++ b/jenkins/run-tests.sh
@@ -222,11 +222,11 @@ setup_ruby_environment() {
     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. If rvm is in use (or something else has set
-        # GEM_HOME) we assume "bundle install" already does something
-        # reasonable.
+        # 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
+        # already set GEM_HOME, we assume that's where dependencies
+        # should be installed, and we should leave it alone.)
 
         if [ -z "$GEM_HOME" ]; then
             user_gempath="$(gem env gempath)"
@@ -240,14 +240,15 @@ setup_ruby_environment() {
         # happen to be installed in $user_gempath, system dirs, etc.
 
         tmpdir_gem_home="$(env - PATH="$PATH" HOME="$GEMHOME" gem env gempath | cut -f1 -d:)"
-        PATH="${tmpdir_gem_home%%:*}/bin:$PATH"
+        PATH="$tmpdir_gem_home/bin:$PATH"
         export GEM_PATH="$tmpdir_gem_home:$(gem env gempath)"
 
-        echo "Will install dependencies to $GEM_HOME"
+        echo "Will install dependencies to $(gem env gemdir)"
         echo "Will install arvados gems to $tmpdir_gem_home"
         echo "Gem search path is GEM_PATH=$GEM_PATH"
     fi
 }
+
 with_test_gemset() {
     if [[ "$using_rvm" == true ]]; then
         "$@"

commit 2fb06b518ef7c6f402d7d8832577400a0814dab0
Author: Tom Clegg <tom at curoverse.com>
Date:   Mon Dec 15 14:43:20 2014 -0500

    4156: Move "bundle install" into separate install_ task like apiserver. Remove one more GEMHOME after merge.

diff --git a/jenkins/run-tests.sh b/jenkins/run-tests.sh
index f5fc1e1..ede7302 100755
--- a/jenkins/run-tests.sh
+++ b/jenkins/run-tests.sh
@@ -458,6 +458,12 @@ do
     do_install "$g" go
 done
 
+install_workbench() {
+    cd "$WORKSPACE/apps/workbench" \
+        && RAILS_ENV=test bundle install --no-deployment
+}
+do_install workbench
+
 test_doclinkchecker() {
     cd "$WORKSPACE/doc"
     bundle exec rake linkchecker baseurl=file://$WORKSPACE/doc/.site/
@@ -500,15 +506,13 @@ done
 
 test_workbench() {
     cd "$WORKSPACE/apps/workbench" \
-        && bundle install --no-deployment \
         && bundle exec rake test ${testargs[workbench]}
 }
 do_test workbench
 
 test_workbench_performance() {
     cd "$WORKSPACE/apps/workbench" \
-        && HOME="$GEMHOME" bundle install --no-deployment \
-        && HOME="$GEMHOME" bundle exec rake test:benchmark
+        && bundle exec rake test:benchmark
 }
 do_test workbench_performance
 

commit 061a0fa3af58c1c1db584e21cb069547288f7e82
Merge: 8bfa3e7 511d087
Author: Tom Clegg <tom at curoverse.com>
Date:   Mon Dec 15 14:28:06 2014 -0500

    4156: Merge branch 'master' into 4156-bundle-install-user


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


hooks/post-receive
--