test-git-branch: add ServerAliveInterval to ssh options

this prevents the ssh control master connection from getting stuck Signed-off-by: Kent Overstreet <[email protected]>
koverstreet · Oct 14, 2024 · 9a71187 · 9a71187
1 parent da8b317
commit 9a71187
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/ci/test-git-branch.sh b/ci/test-git-branch.sh
@@ -13,7 +13,11 @@ ssh_retry() {
 	set +o errexit
 
 	while true; do
-	    ssh "$@"
+	    ssh -o 'ControlMaster=auto'			\
+		-o 'ControlPath=~/.ssh/master-%r@%h:%p'	\
+		-o 'ControlPersist=10m'			\
+		-o 'ServerAliveInterval=10'		\
+		"$@"
 	    (($? == 0)) && break
 	    sleep 1
 	    tput cuu1
@@ -186,7 +190,7 @@ run_test_job() {
 
 	    while true; do
 		tar --create --file - $COMMIT|
-		    ssh $JOBSERVER "(cd $JOBSERVER_OUTPUT_DIR; tar --extract --file -)"
+		    ssh_retry $JOBSERVER "(cd $JOBSERVER_OUTPUT_DIR; tar --extract --file -)"
 		(($? == 0)) && break
 		sleep 1
 		tput cuu1