[ARVADOS-DEV] updated: d3f13c19bdc7b2efe160c66116461faf865fed4e

git at public.curoverse.com git at public.curoverse.com
Tue Oct 13 10:20:02 EDT 2015


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

       via  d3f13c19bdc7b2efe160c66116461faf865fed4e (commit)
      from  8f535386bf3cf4bb0e6a929e4a39796fae235f3f (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 d3f13c19bdc7b2efe160c66116461faf865fed4e
Author: Ward Vandewege <ward at curoverse.com>
Date:   Tue Oct 13 10:18:55 2015 -0400

    Make sure to run the arvados-api-server-upgrade.sh and
    arvados-workbench-upgrade.sh scripts in the RVM environment in
    run-deploy.sh.
    
    no issue #

diff --git a/jenkins/run-deploy.sh b/jenkins/run-deploy.sh
index 8762aae..4953659 100755
--- a/jenkins/run-deploy.sh
+++ b/jenkins/run-deploy.sh
@@ -143,7 +143,7 @@ title "Updating API server"
 SUM_ECODE=0
 run_puppet $IDENTIFIER.arvadosapi.com ECODE
 SUM_ECODE=$(($SUM_ECODE + $ECODE))
-run_command $IDENTIFIER.arvadosapi.com ECODE "/usr/local/bin/arvados-api-server-upgrade.sh"
+run_command $IDENTIFIER.arvadosapi.com ECODE "/usr/local/rvm/bin/rvm-exec /usr/local/bin/arvados-api-server-upgrade.sh"
 SUM_ECODE=$(($SUM_ECODE + $ECODE))
 if [ ! "$IDENTIFIER" = "c97qk" ]
 then
@@ -219,7 +219,7 @@ if [[ `host workbench.$ARVADOS_API_HOST |cut -f4 -d' '` != `host $ARVADOS_API_HO
   SUM_ECODE=$(($SUM_ECODE + $ECODE))
 fi
 
-run_command workbench.$IDENTIFIER ECODE "/usr/local/bin/arvados-workbench-upgrade.sh"
+run_command workbench.$IDENTIFIER ECODE "/usr/local/rvm/bin/rvm-exec /usr/local/bin/arvados-workbench-upgrade.sh"
 SUM_ECODE=$(($SUM_ECODE + $ECODE))
 
 if [[ "$SUM_ECODE" != "0" ]]; then

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list