[ARVADOS-DEV] updated: a34b4c46243a35218b75a28b4075b36057632a85

[Git user]

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

       via  a34b4c46243a35218b75a28b4075b36057632a85 (commit)
      from  a34d17d3b1b83e7b7e04191d609874c18d7cecaf (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 a34b4c46243a35218b75a28b4075b36057632a85
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Thu Jan 30 11:23:49 2020 -0500

    Update deploy script to include API server for ce8i5
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>

diff --git a/jenkins/run-deploy.sh b/jenkins/run-deploy.sh
index 3f19160..6348edc 100755
--- a/jenkins/run-deploy.sh
+++ b/jenkins/run-deploy.sh
@@ -292,15 +292,14 @@ if [[ "$ARVADOS_API_HOST" == "" ]] || [[ "$ARVADOS_API_TOKEN" == "" ]]; then
 fi
 
 title "Gathering list of nodes"
-if [[ "$IDENTIFIER" == "ce8i5" ]]; then
-  start_nodes="keep keep0 shell workbench2"
-  SHELL_NODE_FOR_ARV_KEEPDOCKER=""
-else
-  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`
-  SHELL_NODE_FOR_ARV_KEEPDOCKER="shell.$IDENTIFIER"
-  start_nodes="workbench manage switchyard $SHELL_NODES $KEEP_NODES"
+start_nodes="workbench"
+if [[ "$IDENTIFIER" != "ce8i5" ]]; then
+  start_nodes="$start_nodes manage switchyard"
 fi
+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`
+SHELL_NODE_FOR_ARV_KEEPDOCKER="shell.$IDENTIFIER"
+start_nodes="$start_nodes $SHELL_NODES $KEEP_NODES $ARVADOS_API_HOST"
 
 nodes=""
 for n in $start_nodes; do

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


hooks/post-receive
--