Add section for how to connect to Skia swarming bots

No-Try: true
Docs-Preview: https://skia.org/?cl=67849
Bug: skia:7098
Change-Id: Ib603bdd2117aab6f626cd68e26529d277a0f1508
Reviewed-on: https://skia-review.googlesource.com/67849
Commit-Queue: Ravi Mistry <rmistry@google.com>
Reviewed-by: Kevin Lubick <kjlubick@google.com>
Reviewed-by: Ben Wagner <benjaminwagner@google.com>

2 files changed, 30 insertions, 25 deletions

diff --git a/site/dev/sheriffing/trooper.md b/site/dev/sheriffing/trooper.md
index e49d7cfb0e..c21af03e78 100644
--- a/site/dev/sheriffing/trooper.md
+++ b/site/dev/sheriffing/trooper.md
@@ -49,31 +49,12 @@ Tips for troopers
 
 - Install the Skia trooper Chrome extension (available [here](https://chrome.google.com/webstore/a/google.com/detail/alerts-for-skia-troopers/fpljhfiomnfioecagooiekldeolcpief)) to be able to see alerts quickly in the browser.
 
-- Where machines are located:
-  - Machine name like "skia-gce-NNN", "skia-i-gce-NNN", "ct-gce-NNN", "skia-ct-gce-NNN", "ct-xxx-builder-NNN" -> GCE
-  - Machine name ends with "a9", "m3" -> Chrome Golo/Labs
-  - Machine name ends with "m5" -> CT bare-metal bots in Chrome Golo
-  - Machine name starts with "skia-e-", "skia-i-" (other than "skia-i-gce-NNN"), "skia-rpi-" -> Chapel Hill lab
+- See [this section](../testing/swarmingbots#connecting-to-swarming-bots) for details on how to connect to the different Skia bots.
 
 - The [chrome-infra hangout](https://goto.google.com/cit-hangout) is useful for
   questions regarding bots managed by the Chrome Infra team and to get
   visibility into upstream failures that cause problems for us.
 
-- To log in to a Linux bot in GCE, use `gcloud compute ssh default@<machine
-  name>`. Choose the zone listed for the
-  [GCE VM](https://console.cloud.google.com/project/31977622648/compute/instances)
-  (or specify it using the `--zone` command-line flag).
-
-- To log in to a Windows bot in GCE, use
-  [Chrome RDP Extension](https://chrome.google.com/webstore/detail/chrome-rdp/cbkkbcmdlboombapidmoeolnmdacpkch?hl=en-US)
-  with the
-  [IP address of the GCE VM](https://console.cloud.google.com/project/31977622648/compute/instances)
-  shown on the [host info page](https://status.skia.org/hosts) for that bot. The
-  username is chrome-bot and the password can be found on
-  [Valentine](https://valentine.corp.google.com/) as "chrome-bot (Win GCE)".
-
-- To log in to other bots, see the [Skolo maintenance doc](https://docs.google.com/document/d/1zTR1YtrIFBo-fRWgbUgvJNVJ-s_4_sNjTrHIoX2vulo/edit#heading=h.2nq3yd1axg0n) remote access section.
-
 - If there is a problem with a bot in the Chrome Golo or Chrome infra GCE, the
   best course of action is to
   [file a bug](https://code.google.com/p/chromium/issues/entry?template=Build%20Infrastructure)
diff --git a/site/dev/testing/swarmingbots.md b/site/dev/testing/swarmingbots.md
index 4f28ddd5ca..4aa9115099 100644
--- a/site/dev/testing/swarmingbots.md
+++ b/site/dev/testing/swarmingbots.md
@@ -20,6 +20,24 @@ Skia's Swarming bots are hosted in three places:
 [go/skbl](https://goto.google.com/skbl) lists all Skia Swarming bots.
 
 
+<a name="connecting-to-swarming-bots"></a>
+Connecting to Swarming Bots
+---------------------------
+
+- Machine name like “skia-gce-NNN”, “skia-i-gce-NNN”, “ct-gce-NNN”, “skia-ct-gce-NNN”, “ct-xxx-builder-NNN” -> GCE
+  * To log in to a Linux bot in GCE, use `gcloud compute ssh default@<machine name>`. Choose the zone listed for the [GCE VM][gce instances link] (or specify it using the `--zone` command-line flag).
+  * To log in to a Windows bot in GCE, use [Chrome RDP Extension][chrome rdp extension] with the [IP address of the GCE VM][gce instances link]. The username is chrome-bot and the password can be found on [Valentine](https://goto.google.com/valentine) as "chrome-bot (Win GCE)".
+
+- Machine name ends with “a9”, “m3”, "m5" -> Chrome Golo/Labs
+  * To log in to Golo bots, see [go/swarming-ssh](https://goto.google.com/swarming-ssh).
+
+- Machine name starts with “skia-e-”, “skia-i-” (other than “skia-i-gce-NNN”), “skia-rpi-” -> Chapel Hill lab (aka Skolo)<br/>
+  To log in to Skolo bots, see the [Skolo maintenance doc][remote access] remote access section. See the following for OS specific instructions:<br/>
+  * [Remotely debug an Android device in Skolo][remotely debug android]
+  * [VNC to Skolo Windows bots][vnc to skolo windows]
+  * [ChromeOS Debugging][chromeos debugging]
+
+
 Debugging
 ---------
 
@@ -27,11 +45,9 @@ If you need to run code on a specific machine/device to debug an issue, the simp
 run tryjobs (after adding debugging output to the relevant code). In some cases you may also need to
 [create or modify tryjobs](automated_testing#adding-new-jobs).
 
-For Googlers: If you need more control (e.g. to run GDB), the [current Trooper][current trooper] can
-loan a machine/device from the Skolo. All bots are accessible via either SSH or VNC -- see the
-[Skolo maintenance doc remote access section][remote access] and/or get help from the Trooper. You
-can also bring the device back to your desk and connect it to GoogleGuest WiFi or the [Google Test
-Network](http://go/gtn-criteria).
+For Googlers: If you need more control (e.g. to run GDB) and need run to directly on a swarming bot then you can use [leasing.skia.org](https://leasing.skia.org).<br/>
+If that does not work then the [current trooper][current trooper] can help you bring the device back to your desk and connect
+it to GoogleGuest Wifi or the [Google Test Network](http://go/gtn-criteria).
 
 If you need to make changes on a Skolo device, please check with an Infra team member. Most can be
 flashed/imaged back to a clean state, but others can not.
@@ -39,10 +55,18 @@ flashed/imaged back to a clean state, but others can not.
 If a permanent change needs to be made on the machine (such as an OS or driver update), please [file
 a bug][infra bug] and assign to jcgregorio for reassignment.
 
+[chrome rdp extension]:
+    https://chrome.google.com/webstore/detail/chrome-rdp/cbkkbcmdlboombapidmoeolnmdacpkch?hl=en-US
 [current trooper]: http://skia-tree-status.appspot.com/trooper
 [remote access]:
     https://docs.google.com/document/d/1zTR1YtrIFBo-fRWgbUgvJNVJ-s_4_sNjTrHIoX2vulo/edit#heading=h.2nq3yd1axg0n
 [infra bug]: https://bugs.chromium.org/p/skia/issues/entry?template=Infrastructure+Bug
+[gce instances link]: https://console.cloud.google.com/project/31977622648/compute/instances
+[remotely debug android]: https://docs.google.com/document/d/1nxn7TobfaLNNfhSTiwstOnjV0jCxYUI1uwW0T_V7BYg/
+[vnc to skolo windows]:
+    https://docs.google.com/document/d/1zTR1YtrIFBo-fRWgbUgvJNVJ-s_4_sNjTrHIoX2vulo/edit#heading=h.7cqd856ft0s
+[chromeos debugging]:
+    https://docs.google.com/document/d/1yJ2LLfLzV6pXKjiameid1LHEz1mj71Ob4wySIYxlBdw/edit#heading=h.9arg79l59xrf
 
 Maintenance Tasks
 -----------------