[arvados] updated: 2.6.0-380-g87eca9e69

[git repository hosting]

Summary of changes:
 tools/salt-install/installer.sh | 18 +++++++++---------
 tools/salt-install/provision.sh |  1 +
 2 files changed, 10 insertions(+), 9 deletions(-)

       via  87eca9e6910859e5f3bf470f896bbf8d039db46e (commit)
       via  ed63798db07504552723b5b49428818fe09da61b (commit)
      from  929825efa55429c7a7c9c9bf76d3a71f94e9d0ce (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 87eca9e6910859e5f3bf470f896bbf8d039db46e
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Wed Aug 2 17:05:23 2023 -0400

    20688: Ensure the salt-call failures turn into provision.sh failures
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>

diff --git a/tools/salt-install/provision.sh b/tools/salt-install/provision.sh
index 7010b388b..2244be171 100755
--- a/tools/salt-install/provision.sh
+++ b/tools/salt-install/provision.sh
@@ -10,6 +10,7 @@
 #
 # vagrant up
 
+set -e
 set -o pipefail
 
 # capture the directory that the script is running from

commit ed63798db07504552723b5b49428818fe09da61b
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Wed Aug 2 14:39:20 2023 -0400

    20688: check for ssh ahead of time, sync only before deploy
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>

diff --git a/tools/salt-install/installer.sh b/tools/salt-install/installer.sh
index 4ce490421..1d6d48340 100755
--- a/tools/salt-install/installer.sh
+++ b/tools/salt-install/installer.sh
@@ -101,10 +101,13 @@ sync() {
 deploynode() {
     local NODE=$1
     local ROLES=$2
+    local BRANCH=$3
 
     # Deploy a node.  This runs the provision script on the node, with
     # the appropriate roles.
 
+    sync $NODE $BRANCH
+
     if [[ -z "$ROLES" ]] ; then
 		echo "No roles specified for $NODE, will deploy all roles"
     else
@@ -279,17 +282,15 @@ case "$subcmd" in
 	if [[ -z "$NODE" ]]; then
 	    for NODE in "${!NODES[@]}"
 	    do
-		# First, push the git repo to each node.  This also
-		# confirms that we have git and can log into each
-		# node.
-		sync $NODE $BRANCH
+		# First, just confirm we can ssh to each node.
+		`ssh_cmd "$NODE"` $DEPLOY_USER@$NODE true
 	    done
 
 	    for NODE in "${!NODES[@]}"
 	    do
 		# Do 'database' role first,
 		if [[ "${NODES[$NODE]}" =~ database ]] ; then
-		    deploynode $NODE "${NODES[$NODE]}"
+		    deploynode $NODE "${NODES[$NODE]}" $BRANCH
 		    unset NODES[$NODE]
 		fi
 	    done
@@ -298,7 +299,7 @@ case "$subcmd" in
 	    do
 		# then  'api' or 'controller' roles
 		if [[ "${NODES[$NODE]}" =~ (api|controller) ]] ; then
-		    deploynode $NODE "${NODES[$NODE]}"
+		    deploynode $NODE "${NODES[$NODE]}" $BRANCH
 		    unset NODES[$NODE]
 		fi
 	    done
@@ -307,12 +308,11 @@ case "$subcmd" in
 	    do
 		# Everything else (we removed the nodes that we
 		# already deployed from the list)
-		deploynode $NODE "${NODES[$NODE]}"
+		deploynode $NODE "${NODES[$NODE]}" $BRANCH
 	    done
 	else
 	    # Just deploy the node that was supplied on the command line.
-	    sync $NODE $BRANCH
-	    deploynode $NODE "${NODES[$NODE]}"
+	    deploynode $NODE "${NODES[$NODE]}" $BRANCH
 	fi
 
 	set +x

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


hooks/post-receive
--