From: Peter Amstutz <peter.amstutz@curii.com>
Date: Sun, 26 Jun 2022 23:43:26 +0000 (-0400)
Subject: 18870: Flexible branch naming
X-Git-Tag: 2.5.0~127^2~21
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/6d154157c70aaf4a5856b170a1b2eb9395348cc1

18870: Flexible branch naming

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz@curii.com>
---

diff --git a/tools/salt-install/installer.sh b/tools/salt-install/installer.sh
index 37f1baf20e..b901651e7c 100755
--- a/tools/salt-install/installer.sh
+++ b/tools/salt-install/installer.sh
@@ -66,6 +66,8 @@ case "$subcmd" in
 
 	set -x
 
+	BRANCH=$(git branch --show-current)
+
 	git add -A
 	if ! git diff --cached --exit-code ; then
 	    git commit -m"prepare for deploy"
@@ -80,11 +82,12 @@ case "$subcmd" in
 		    if ! git remote add $NODE $DEPLOY_USER@$NODE:arvados-setup.git ; then
 			git remote set-url $NODE $DEPLOY_USER@$NODE:arvados-setup.git
 		    fi
-		    git push $NODE master
+		    git push $NODE $BRANCH
 		    ssh $NODE git clone arvados-setup.git arvados-setup
 		fi
 
-		git push $NODE master
+		git push $NODE $BRANCH
+		ssh $NODE git -C arvados-setup checkout $BRANCH
 		ssh $NODE git -C arvados-setup pull
 
 		ssh $DEPLOY_USER@$NODE "cd arvados-setup && sudo ./provision.sh --config local.params --roles ${NODES[$NODE]}"