tcwg-buildslave: Update TCWG SSH configuration

Change-Id: I7875eaa1a7124b1bc8c0b9d58daffced680e177d

1 files changed, 19 insertions, 34 deletions

diff --git a/tcwg-buildslave/.ssh/config b/tcwg-buildslave/.ssh/config
index 8357cf9..46ced13 100644
--- a/tcwg-buildslave/.ssh/config
+++ b/tcwg-buildslave/.ssh/config
@@ -6,7 +6,7 @@
 # !!! IMPORTANT NOTE. AS PENANCE, YOU WILL READ THIS NOTE OUT LOUD. !!!
 #
 
-Host *.tcwglab *.tl *.aus-colo *.aus tcwg-* gateway.tcwglab.linaro.org people.linaro.org linaro-private.git.linaro.org aus-colo.linaro.org
+Host *.tcwglab *.aus-colo people.linaro.org aus-colo.linaro.org
  #User @LDAP_USER@
  #IdentityFile ~/.ssh/id_rsa
 
@@ -14,54 +14,39 @@ Host lab.validation.linaro.org
  #User @LP_USER@
  #IdentityFile ~/.ssh/id_rsa
 
-# Access to Austin Colo.  E.g., "ssh r1-a7.aus"
-Host *.aus-colo *.aus
- ProxyCommand ~/.ssh/ssh-smart-nc aus-colo.linaro.org 10.10.0.1 28:80:23:90:1f:f0 -q0 $(echo %h | sed -e s/.aus$/.aus-colo/) %p
+# Access to Austin Colo.  E.g., "ssh r1-a7.aus-colo"
+Host *.aus-colo
+ ProxyCommand 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/ssh-smart-nc lab.validation.linaro.org 10.0.0.1 2c:59:e5:9a:43:8c -q0 $(basename %h .lab) %p
+ ProxyCommand ssh lab.validation.linaro.org nc -q0 $(basename %h .lab) %p
 
-Host *.tcwglab *.tl *.aus-colo *.aus *.lab tcwg-*
- # With uneasy heart, enable automatic multiplexing.  See commit log.
+Host *.tcwglab *.aus-colo *.lab
+ # Enable automatic multiplexing.
+ ControlMaster auto
  # Soften up potential problems with killing master connection by using
  # ControlPersist (which puts the master connection in background).
- ControlMaster auto
+ # Also ControlPersist has an undocumented feature that it will clean-up
+ # and replace stale ssh socket from a zombie connection.
  ControlPersist 5m
+ # Put the ssh socket on /tmp.  Note that overlayfs can't host sockets,
+ # so we always arrange /tmp to be on a ext4 or equivalent FS.
  ControlPath /tmp/ssh-%u-%r@%h:%p
  # There is little point in forwarding X11 to machines outside of local network.
  ForwardX11 no
  # Forward authentication agent and keep private keys in one place.
  ForwardAgent yes
- # Ping server every minute to avoid routers dropping connection.
- ServerAliveInterval 60
-
-Host *.tcwglab *.tl *.aus-colo *.aus *.lab ex40-*.tcwglab.linaro.org
+ # Ping server every 5min to avoid routers dropping connection.
+ # This matches -o BatchMode=yes setting used in cross-testing (see ABE)
+ ServerAliveInterval 300
  # Disable checking of host keys for boards behind gateways.
+ # !!! BE BECAREFUL TO ONLY DO THIS FOR MACHINES BEHIND SSH GATEWAY OR VPN !!!
  StrictHostKeyChecking no
+ # Don't store host keys for one-time containers
  UserKnownHostsFile /dev/null
- LogLevel QUIET
-
-### Short names ###
-
-Host tcwg-ex40-01
- HostName ex40-01.tcwglab.linaro.org
-Host tcwg-ex40-02
- HostName ex40-02.tcwglab.linaro.org
-Host tcwg-ex40-03
- HostName ex40-03.tcwglab.linaro.org
-Host tcwg-ex40-04
- HostName ex40-04.tcwglab.linaro.org
-Host tcwg-ex40-05
- HostName ex40-05.tcwglab.linaro.org
-Host tcwg-ex40-06
- HostName ex40-06.tcwglab.linaro.org
-Host tcwg-ex40-07
- HostName ex40-07.tcwglab.linaro.org
-Host tcwg-ex40-08
- HostName ex40-08.tcwglab.linaro.org
-Host tcwg-ex40-09
- HostName ex40-09.tcwglab.linaro.org
+ # Don't warn about "adding" host keys to /dev/null
+ LogLevel FATAL
 
 Host git.linaro.org dev-private-git.linaro.org
  User git