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 71105e9b93821aba18291c136bf8f70881219956..edecb211b79dcac25cda058f81fecba0bc30cc18 100755 (executable)
--- 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 436f5bdaf617b6408c4d8ee234b5bce096ce59fd..d39cdd441bfbabb21e93f166ec2be94b626ae7a2 100755 (executable)
--- 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 a481985e51aaa43186f329260387b03a0d0eb849..e981517bfdb0b1c849a1ed3997ed81905e3c5062 100755 (executable)
--- 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."