X-Git-Url: https://git.arvados.org/arvados-dev.git/blobdiff_plain/d8d561588362cf4c2e100949b39eb45661471535..d3f13c19bdc7b2efe160c66116461faf865fed4e:/jenkins/run-deploy.sh

diff --git a/jenkins/run-deploy.sh b/jenkins/run-deploy.sh
index 43b17b8..4953659 100755
--- a/jenkins/run-deploy.sh
+++ b/jenkins/run-deploy.sh
@@ -15,10 +15,12 @@ function usage {
     echo >&2 "Note: this script requires an arvados token created with these permissions:"
     echo >&2 '  arv api_client_authorization create_system_auth \'
     echo >&2 '    --scopes "[\"GET /arvados/v1/virtual_machines\",'
+    echo >&2 '               \"GET /arvados/v1/keep_services\",'
     echo >&2 '               \"GET /arvados/v1/keep_services/\",'
     echo >&2 '               \"GET /arvados/v1/groups\",'
-    echo >&2 '               \"GET /arvados/v1/links\",'
     echo >&2 '               \"GET /arvados/v1/groups/\",'
+    echo >&2 '               \"GET /arvados/v1/links\",'
+    echo >&2 '               \"GET /arvados/v1/collections\",'
     echo >&2 '               \"POST /arvados/v1/collections\",'
     echo >&2 '               \"POST /arvados/v1/links\"]"'
     echo >&2
@@ -137,6 +139,24 @@ function run_command() {
   eval "$return_var=$ECODE"
 }
 
+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/rvm/bin/rvm-exec /usr/local/bin/arvados-api-server-upgrade.sh"
+SUM_ECODE=$(($SUM_ECODE + $ECODE))
+if [ ! "$IDENTIFIER" = "c97qk" ]
+then
+  run_command $IDENTIFIER.arvadosapi.com ECODE "dpkg -L arvados-mailchimp-plugin 2>/dev/null && apt-get install arvados-mailchimp-plugin --reinstall || echo"
+  SUM_ECODE=$(($SUM_ECODE + $ECODE))
+fi
+
+if [[ "$SUM_ECODE" != "0" ]]; then
+  title "ERROR: Updating API server FAILED"
+  EXITCODE=$(($EXITCODE + $SUM_ECODE))
+  exit $EXITCODE
+fi
+
 title "Loading ARVADOS_API_HOST and ARVADOS_API_TOKEN"
 if [[ -f "$HOME/.config/arvados/$IDENTIFIER.arvadosapi.com.conf" ]]; then
   . $HOME/.config/arvados/$IDENTIFIER.arvadosapi.com.conf
@@ -191,30 +211,15 @@ title "Gathering list of shell and Keep nodes"
 SHELL_NODES=`ARVADOS_API_HOST=$ARVADOS_API_HOST ARVADOS_API_TOKEN=$ARVADOS_API_TOKEN arv virtual_machine list |jq .items[].hostname -r`
 KEEP_NODES=`ARVADOS_API_HOST=$ARVADOS_API_HOST ARVADOS_API_TOKEN=$ARVADOS_API_TOKEN arv keep_service list |jq .items[].service_host -r`
 
-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"
-SUM_ECODE=$(($SUM_ECODE + $ECODE))
-run_command $IDENTIFIER.arvadosapi.com ECODE "dpkg -L arvados-mailchimp-plugin 2>/dev/null && apt-get install arvados-mailchimp-plugin --reinstall || echo"
-SUM_ECODE=$(($SUM_ECODE + $ECODE))
-
-if [[ "$SUM_ECODE" != "0" ]]; then
-  title "ERROR: Updating API server FAILED"
-  EXITCODE=$(($EXITCODE + $SUM_ECODE))
-  exit $EXITCODE
-fi
-
 title "Updating workbench"
 SUM_ECODE=0
-if [[ `host workbench.$ARVADOS_API_HOST` != `host $ARVADOS_API_HOST` ]]; then
+if [[ `host workbench.$ARVADOS_API_HOST |cut -f4 -d' '` != `host $ARVADOS_API_HOST |cut -f4 -d' '` ]]; then
   # Workbench runs on a separate host. We need to run puppet there too.
   run_puppet workbench.$IDENTIFIER ECODE
   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
@@ -223,7 +228,7 @@ if [[ "$SUM_ECODE" != "0" ]]; then
   exit $EXITCODE
 fi
 
-for n in manage $SHELL_NODES $KEEP_NODES; do
+for n in manage switchyard $SHELL_NODES $KEEP_NODES; do
   ECODE=0
   if [[ $n =~ $ARVADOS_API_HOST$ ]]; then
     # e.g. keep.qr1hi.arvadosapi.com