From 5f6c31ee622e30223f7b852e96d07d9b95969c47 Mon Sep 17 00:00:00 2001 From: ludamad Date: Tue, 14 May 2024 09:11:02 -0400 Subject: [PATCH] chore(ci): reuse ssh connections (#6382) --- scripts/run_on_builder | 2 +- scripts/run_on_tester | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/run_on_builder b/scripts/run_on_builder index 888a0dc5d0c..e9522f973ed 100755 --- a/scripts/run_on_builder +++ b/scripts/run_on_builder @@ -4,4 +4,4 @@ set -eu # Enter the repo root cd "$(dirname "$0")/.." -ssh -o TCPKeepAlive=no -o ServerAliveCountMax=20 -o ServerAliveInterval=30 -o StrictHostKeyChecking=no -i "$BUILDER_SPOT_KEY" ubuntu@"$BUILDER_SPOT_IP" "$@" \ No newline at end of file +ssh -o ControlMaster=auto -o ControlPath=~/.ssh_mux_%h_%p_%r -o ControlPersist=10m -o TCPKeepAlive=no -o ServerAliveCountMax=20 -o ServerAliveInterval=30 -o StrictHostKeyChecking=no -i "$BUILDER_SPOT_KEY" ubuntu@"$BUILDER_SPOT_IP" "$@" diff --git a/scripts/run_on_tester b/scripts/run_on_tester index 075a3b5cbe5..ae82e429f15 100755 --- a/scripts/run_on_tester +++ b/scripts/run_on_tester @@ -4,4 +4,4 @@ set -eu # Enter the repo root cd "$(dirname "$0")/.." -ssh -o TCPKeepAlive=no -o ServerAliveCountMax=20 -o ServerAliveInterval=30 -o StrictHostKeyChecking=no -i "$SPOT_KEY" ubuntu@"$SPOT_IP" "$@" \ No newline at end of file +ssh -o ControlMaster=auto -o ControlPath=~/.ssh_mux_%h_%p_%r -o ControlPersist=10m -o TCPKeepAlive=no -o ServerAliveCountMax=20 -o ServerAliveInterval=30 -o StrictHostKeyChecking=no -i "$SPOT_KEY" ubuntu@"$SPOT_IP" "$@"