Fixups for bringing rack6 online.
Bug: skia:13404
Change-Id: I657072ef091c34f0746825751fb8620aa8037afc
Reviewed-on: https://skia-review.googlesource.com/c/buildbot/+/566296
Commit-Queue: Joe Gregorio <jcgregorio@google.com>
Reviewed-by: Ravi Mistry <rmistry@google.com>
diff --git a/skolo/ansible/hosts.yml b/skolo/ansible/hosts.yml
index 334217e..cd5ab29 100644
--- a/skolo/ansible/hosts.yml
+++ b/skolo/ansible/hosts.yml
@@ -84,6 +84,7 @@
children:
rack1_switchboard_rpis:
rack4_switchboard_rpis:
+ rack6_rpi:
rack4_switchboard_rpis:
hosts:
@@ -113,6 +114,7 @@
rack1_linux:
rack2_linux:
rack3_linux:
+ rack6_linux:
gapid_test_machines:
vars:
swarming_needs__needs_mobile_tools: false
@@ -297,6 +299,7 @@
rack1_mac:
rack2_mac:
rack3_mac:
+ rack6_mac:
vars:
install_test_machine_monitor__start_swarming: true
skolo_group: staff
@@ -317,6 +320,8 @@
rack6_rpi:
rack6_linux:
+ hosts:
+ skia-e-linux-600:
rack6_mac:
@@ -329,5 +334,6 @@
rack1_win:
rack2_win:
rack3_win:
+ rack6_win:
vars:
install_test_machine_monitor__start_swarming: true
diff --git a/skolo/ansible/ssh.cfg b/skolo/ansible/ssh.cfg
index 86aeeff..caf40bb 100644
--- a/skolo/ansible/ssh.cfg
+++ b/skolo/ansible/ssh.cfg
@@ -44,6 +44,10 @@
Hostname %h
ProxyJump chrome-bot@rack3:22
+Match host skia-e-*-6*
+ Hostname %h
+ ProxyJump chrome-bot@rack6:22
+
Match host skia-rpi2-rack4-*
Hostname %h
ProxyJump chrome-bot@rack4:22
@@ -77,6 +81,10 @@
Hostname 192.168.1.1
ProxyJump chrome-bot@rack5:22
+Host router-rack6
+ Hostname 192.168.1.1
+ ProxyJump chrome-bot@rack6:22
+
# Switches
Host rack5-shelf*-poe-switch
User ubnt