Commit b2ff224d authored by John Budorick's avatar John Budorick Committed by Commit Bot

doc: update references to pool:Chrome.

Bug: 1011474
Change-Id: I06d9feecb00ce7e9d277b965a069ff997887fdff
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1917460
Commit-Queue: John Budorick <jbudorick@chromium.org>
Auto-Submit: John Budorick <jbudorick@chromium.org>
Reviewed-by: default avatarBen Pastene <bpastene@chromium.org>
Cr-Commit-Position: refs/heads/master@{#715305}
parent 952819fe
...@@ -377,9 +377,9 @@ Email kbr@ if you try this and find it doesn't work. ...@@ -377,9 +377,9 @@ Email kbr@ if you try this and find it doesn't work.
See the [Swarming documentation] for instructions on how to upload your binaries to the isolate server and trigger execution on Swarming. See the [Swarming documentation] for instructions on how to upload your binaries to the isolate server and trigger execution on Swarming.
Be sure to use the correct swarming dimensions for your desired GPU e.g. "1002:6613" instead of "AMD Radeon R7 240 (1002:6613)" which is how it appears on swarming task page. You can query bots in the Chrome-GPU pool to find the correct dimensions: Be sure to use the correct swarming dimensions for your desired GPU e.g. "1002:6613" instead of "AMD Radeon R7 240 (1002:6613)" which is how it appears on swarming task page. You can query bots in the chromium.tests.gpu pool to find the correct dimensions:
* `python tools\swarming_client\swarming.py bots -S chromium-swarm.appspot.com -d pool Chrome-GPU` * `python tools\swarming_client\swarming.py bots -S chromium-swarm.appspot.com -d pool chromium.tests.gpu`
[Swarming documentation]: https://www.chromium.org/developers/testing/isolated-testing/for-swes#TOC-Run-a-test-built-locally-on-Swarming [Swarming documentation]: https://www.chromium.org/developers/testing/isolated-testing/for-swes#TOC-Run-a-test-built-locally-on-Swarming
......
...@@ -25,11 +25,11 @@ waterfalls, and various tryservers, as described in [Using the GPU Bots]. ...@@ -25,11 +25,11 @@ waterfalls, and various tryservers, as described in [Using the GPU Bots].
[Using the GPU Bots]: gpu_testing.md#Using-the-GPU-Bots [Using the GPU Bots]: gpu_testing.md#Using-the-GPU-Bots
All of the physical hardware for the bots lives in the Swarming pool, and most All of the physical hardware for the bots lives in the Swarming pool, and most
of it in the Chrome-GPU Swarming pool. The waterfall bots are simply virtual of it in the chromium.tests.gpu Swarming pool. The waterfall bots are simply
machines which spawn Swarming tasks with the appropriate tags to get them to run virtual machines which spawn Swarming tasks with the appropriate tags to get
on the desired GPU and operating system type. So, for example, the [Win10 x64 them to run on the desired GPU and operating system type. So, for example, the
Release (NVIDIA)] bot is actually a virtual machine which spawns all of its jobs [Win10 x64 Release (NVIDIA)] bot is actually a virtual machine which spawns all
with the Swarming parameters: of its jobs with the Swarming parameters:
[Win10 x64 Release (NVIDIA)]: https://ci.chromium.org/p/chromium/builders/ci/Win10%20x64%20Release%20%28NVIDIA%29 [Win10 x64 Release (NVIDIA)]: https://ci.chromium.org/p/chromium/builders/ci/Win10%20x64%20Release%20%28NVIDIA%29
...@@ -37,7 +37,7 @@ with the Swarming parameters: ...@@ -37,7 +37,7 @@ with the Swarming parameters:
{ {
"gpu": "10de:1cb3-23.21.13.8816", "gpu": "10de:1cb3-23.21.13.8816",
"os": "Windows-10", "os": "Windows-10",
"pool": "Chrome-GPU" "pool": "chromium.tests.gpu"
} }
``` ```
...@@ -220,7 +220,7 @@ In the [chromium/src] workspace: ...@@ -220,7 +220,7 @@ In the [chromium/src] workspace:
In the [infradata/config] workspace (Google internal only, sorry): In the [infradata/config] workspace (Google internal only, sorry):
* [gpu.star] * [gpu.star]
* Defines a `Chrome-GPU` Swarming pool which contains most of the * Defines a `chromium.tests.gpu` Swarming pool which contains most of the
specialized hardware: as of this writing, the Windows and Linux NVIDIA specialized hardware: as of this writing, the Windows and Linux NVIDIA
bots, the Windows AMD bots, and the MacBook Pros with NVIDIA and AMD bots, the Windows AMD bots, and the MacBook Pros with NVIDIA and AMD
GPUs. New GPU hardware should be added to this pool. GPUs. New GPU hardware should be added to this pool.
...@@ -325,10 +325,10 @@ Builder]. ...@@ -325,10 +325,10 @@ Builder].
to determine the PCI IDs of the GPUs in the bots. (These instructions will to determine the PCI IDs of the GPUs in the bots. (These instructions will
need to be updated for Android bots which don't have PCI buses.) need to be updated for Android bots which don't have PCI buses.)
1. Make sure to add these new machines to the Chrome-GPU Swarming pool by 1. Make sure to add these new machines to the chromium.tests.gpu Swarming
creating a CL against [gpu.star] in the [infradata/config] (Google pool by creating a CL against [gpu.star] in the [infradata/config]
internal) workspace. Git configure your user.email to @google.com if (Google internal) workspace. Git configure your user.email to
necessary. Here is one [example @google.com if necessary. Here is one [example
CL](https://chrome-internal-review.googlesource.com/913528) and a CL](https://chrome-internal-review.googlesource.com/913528) and a
[second [second
example](https://chrome-internal-review.googlesource.com/1111456). example](https://chrome-internal-review.googlesource.com/1111456).
...@@ -346,8 +346,8 @@ Builder]. ...@@ -346,8 +346,8 @@ Builder].
1. The swarming dimensions are crucial. These must match the GPU and 1. The swarming dimensions are crucial. These must match the GPU and
OS type of the physical hardware in the Swarming pool. This is what OS type of the physical hardware in the Swarming pool. This is what
causes the VMs to spawn their tests on the correct hardware. Make causes the VMs to spawn their tests on the correct hardware. Make
sure to use the Chrome-GPU pool, and that the new machines were sure to use the chromium.tests.gpu pool, and that the new machines
specifically added to that pool. were specifically added to that pool.
1. Make triply sure that there are no collisions between the new 1. Make triply sure that there are no collisions between the new
hardware you're adding and hardware already in the Swarming pool. hardware you're adding and hardware already in the Swarming pool.
For example, it used to be the case that all of the Windows NVIDIA For example, it used to be the case that all of the Windows NVIDIA
......
...@@ -94,7 +94,7 @@ Here's how to run `chrome_public_test_apk` on a bot with a Nexus 5 running KitKa ...@@ -94,7 +94,7 @@ Here's how to run `chrome_public_test_apk` on a bot with a Nexus 5 running KitKa
```sh ```sh
$ tools/mb/mb.py run \ $ tools/mb/mb.py run \
-s --no-default-dimensions \ -s --no-default-dimensions \
-d pool Chrome \ -d pool chromium.tests \
-d device_os_type userdebug -d device_os KTU84P -d device_type hammerhead \ -d device_os_type userdebug -d device_os KTU84P -d device_type hammerhead \
out/Android-arm-dbg chrome_public_test_apk out/Android-arm-dbg chrome_public_test_apk
``` ```
...@@ -194,8 +194,8 @@ $ tools/swarming_client/swarming.py trigger \ ...@@ -194,8 +194,8 @@ $ tools/swarming_client/swarming.py trigger \
``` ```
There are two more things you need to fill in here. The first is the pool name; There are two more things you need to fill in here. The first is the pool name;
you should pick "Chrome" unless you know otherwise. The pool is the collection you should pick "chromium.tests" unless you know otherwise. The pool is the
of hosts from which swarming will try to pick bots to run your tasks. collection of hosts from which swarming will try to pick bots to run your tasks.
The second is the criteria, which is how you specify which bot(s) you want your The second is the criteria, which is how you specify which bot(s) you want your
task scheduled on. These are specified via "dimensions", which are specified task scheduled on. These are specified via "dimensions", which are specified
...@@ -220,7 +220,7 @@ URL for the task it created, and a command you can run to collect the results of ...@@ -220,7 +220,7 @@ URL for the task it created, and a command you can run to collect the results of
that task. For example: that task. For example:
``` ```
Triggered task: ellyjones@chromium.org/os=Linux_pool=Chrome/e625130b712096e3908266252c8cd779d7f442f1 Triggered task: ellyjones@chromium.org/os=Linux_pool=chromium.tests/e625130b712096e3908266252c8cd779d7f442f1
To collect results, use: To collect results, use:
tools/swarming_client/swarming.py collect -S https://chromium-swarm.appspot.com 46fc393777163310 tools/swarming_client/swarming.py collect -S https://chromium-swarm.appspot.com 46fc393777163310
Or visit: Or visit:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment