[ARVADOS-DEV] updated: d8b5db8865d9d2929e9a3fe708d609d10622817f

[git at public.curoverse.com]

Summary of changes:
 jenkins/arvados-api-server-extras/arvados-api-server-upgrade.sh | 9 +++++++++
 jenkins/arvados-sso-server-extras/arvados-sso-server.postinst   | 9 +++++++++
 jenkins/arvados-workbench-extras/arvados-workbench-upgrade.sh   | 9 +++++++++
 3 files changed, 27 insertions(+)

       via  d8b5db8865d9d2929e9a3fe708d609d10622817f (commit)
      from  d119e26a14b0bc143638ca38926a4a0d911fe8f1 (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 d8b5db8865d9d2929e9a3fe708d609d10622817f
Author: Ward Vandewege <ward at curoverse.com>
Date:   Fri Oct 23 16:31:18 2015 -0400

    Make sure bundle is installed in arvados-api-server-upgrade.sh,
    arvados-workbench-upgrade.sh and arvados-sso-server.postinst
    
    No issue #

diff --git a/jenkins/arvados-api-server-extras/arvados-api-server-upgrade.sh b/jenkins/arvados-api-server-extras/arvados-api-server-upgrade.sh
index 71105e9..edecb21 100755
--- a/jenkins/arvados-api-server-extras/arvados-api-server-upgrade.sh
+++ b/jenkins/arvados-api-server-extras/arvados-api-server-upgrade.sh
@@ -53,6 +53,15 @@ if [[ ! -e $SHARED_PATH/log/production.log ]]; then touch $SHARED_PATH/log/produ
 cd "$RELEASE_PATH"
 export RAILS_ENV=production
 
+echo "Making sure bundle is installed"
+set +e
+which bundle > /dev/null
+if [[ "$?" != "0" ]]; then
+  gem install bundle
+fi
+set -e
+echo "Done."
+
 echo "Running bundle install"
 bundle install --path $SHARED_PATH/vendor_bundle
 echo "Done."
diff --git a/jenkins/arvados-sso-server-extras/arvados-sso-server.postinst b/jenkins/arvados-sso-server-extras/arvados-sso-server.postinst
index 436f5bd..d39cdd4 100755
--- a/jenkins/arvados-sso-server-extras/arvados-sso-server.postinst
+++ b/jenkins/arvados-sso-server-extras/arvados-sso-server.postinst
@@ -126,6 +126,15 @@ EOF
   cd "$RELEASE_PATH"
   export RAILS_ENV=production
 
+  echo "Making sure bundle is installed ..."
+  set +e
+  which bundle > /dev/null
+  if [[ "$?" != "0" ]]; then
+    $COMMAND_PREFIX gem install bundle
+  fi
+  set -e
+  echo "... done."
+
   echo -n "Running bundle install ..."
   $COMMAND_PREFIX bundle install --path $SHARED_PATH/vendor_bundle --quiet || exit $?
   echo "... done."
diff --git a/jenkins/arvados-workbench-extras/arvados-workbench-upgrade.sh b/jenkins/arvados-workbench-extras/arvados-workbench-upgrade.sh
index a481985..e981517 100755
--- a/jenkins/arvados-workbench-extras/arvados-workbench-upgrade.sh
+++ b/jenkins/arvados-workbench-extras/arvados-workbench-upgrade.sh
@@ -46,6 +46,15 @@ if [[ ! -e $RELEASE_PATH/tmp ]]; then mkdir -p $RELEASE_PATH/tmp; fi
 if [[ ! -e $RELEASE_PATH/log ]]; then ln -s $SHARED_PATH/log $RELEASE_PATH/log; fi
 if [[ ! -e $SHARED_PATH/log/production.log ]]; then touch $SHARED_PATH/log/production.log; fi
 
+echo "Making sure bundle is installed"
+set +e
+which bundle > /dev/null
+if [[ "$?" != "0" ]]; then
+  gem install bundle
+fi
+set -e
+echo "Done."
+
 echo "Running bundle install"
 (cd $RELEASE_PATH && RAILS_ENV=production bundle install --path $SHARED_PATH/vendor_bundle)
 echo "Done."

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


hooks/post-receive
--