aboutsummaryrefslogtreecommitdiff
path: root/tcwg-buildslave
diff options
context:
space:
mode:
authorMaxim Kuvyrkov <maxim.kuvyrkov@linaro.org>2016-07-29 11:14:13 +0100
committerMaxim Kuvyrkov <maxim.kuvyrkov@linaro.org>2016-07-29 11:14:13 +0100
commit6bced3dca5c174bfe5b5d1d0632e80445e6fb285 (patch)
treed390e8ff940c7ba82ffa56befb76a9c970cc465a /tcwg-buildslave
parent5f46c8b6f0e8887121295d78435db10dfa3b5b7c (diff)
tcwg-buildslave: Robustify ssh connections via ProxyCommand
Don't use multiplexed connections to ssh gateways. Note that connections to the final ssh destinations will still be multiplexed. This avoids connection to r1-a12.aus-colo being dropped when connection to r1-a7.aus-colo is being forced-closed, and r1-a12.aus-colo happened to share connection to aus-colo.linaro.org created by ssh process for r1-a7.aus-colo. Change-Id: I2a79e3b4e51a71d25e927fdf0472f9111f3f8336
Diffstat (limited to 'tcwg-buildslave')
-rw-r--r--tcwg-buildslave/.ssh/config11
1 files changed, 3 insertions, 8 deletions
diff --git a/tcwg-buildslave/.ssh/config b/tcwg-buildslave/.ssh/config
index 46ced13..0dd7fc2 100644
--- a/tcwg-buildslave/.ssh/config
+++ b/tcwg-buildslave/.ssh/config
@@ -6,21 +6,17 @@
# !!! IMPORTANT NOTE. AS PENANCE, YOU WILL READ THIS NOTE OUT LOUD. !!!
#
-Host *.tcwglab *.aus-colo people.linaro.org aus-colo.linaro.org
+Host *.tcwglab *.aus-colo people.linaro.org aus-colo.linaro.org lab.validation.linaro.org
#User @LDAP_USER@
#IdentityFile ~/.ssh/id_rsa
-Host lab.validation.linaro.org
- #User @LP_USER@
- #IdentityFile ~/.ssh/id_rsa
-
# Access to Austin Colo. E.g., "ssh r1-a7.aus-colo"
Host *.aus-colo
- ProxyCommand ssh aus-colo.linaro.org nc -q0 %h %p
+ ProxyCommand -Snone ssh aus-colo.linaro.org nc -q0 %h %p
# Access to LAVA Lab. E.g., "ssh root@10.7.0.18.lab"
Host *.lab
- ProxyCommand ssh lab.validation.linaro.org nc -q0 $(basename %h .lab) %p
+ ProxyCommand ssh -Snone lab.validation.linaro.org nc -q0 $(basename %h .lab) %p
Host *.tcwglab *.aus-colo *.lab
# Enable automatic multiplexing.
@@ -51,4 +47,3 @@ Host *.tcwglab *.aus-colo *.lab
Host git.linaro.org dev-private-git.linaro.org
User git
# === END: TCWG SSH configuration ===
-