Skip to content

GitLab

T
tangled
Commit 3fbea994 authored by Yuly Novikov's avatar Yuly Novikov Committed by Commit Bot
Browse files
Options

Use targeted OS version for GPU bots. 

Also update the documentation.

Bug: 978103, 898684
Change-Id: I412fa68addac0327c7632d83a90606f99e6ebc31
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1680974Reviewed-by: default avatarKenneth Russell <kbr@chromium.org>
Commit-Queue: Yuly Novikov <ynovikov@chromium.org>
Cr-Commit-Position: refs/heads/master@{#673418}
parent f7029b26
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 574 additions and 568 deletions
docs/gpu/gpu_testing_bot_details.md
View file @ 3fbea994
......@@ -578,28 +578,30 @@ Win10 Release (CoolNewGPUType)".
1. After your CLs land you should be able to find and run `win-myproject-rel` on CLs
using Choose Trybots in Gerrit.
### How to test and deploy a driver update
### How to test and deploy a driver and/or OS update
Let's say that you want to roll out an update to the graphics drivers on one of
the configurations like the Win10 NVIDIA bots. In order to verify that the new
driver won't destabilize Chromium's commit queue, it's necessary to run the new
driver on one of the waterfalls for a day or two to make sure the tests are
reliably green before rolling out the driver update. To do this:
Let's say that you want to roll out an update to the graphics drivers or the OS
on one of the configurations like the Linux NVIDIA bots. In order to verify
that the new driver or OS won't destabilize Chromium's commit queue,
it's necessary to run the new driver or OS on one of the waterfalls for a day
or two to make sure the tests are reliably green before rolling out the driver
or OS update. To do this:
1. Make sure that all of the current Swarming jobs for this OS and GPU
configuration are targeted at the "stable" version of the driver in
[waterfalls.pyl] and [mixins.pyl]. Make sure that there is a "named" stable
version of the driver there, which targets the _TARGETED_DRIVER_VERSIONS
dictionary in [bot_config.py] (Google internal).
1. File a `Build Infrastructure` bug, component `Infra>Labs`, to have ~4 of the
physical machines already in the Swarming pool upgraded to the new version
of the driver.
configuration are targeted at the "stable" version of the driver and the OS
in [waterfalls.pyl] and [mixins.pyl]. Make sure that there are "named"
stable versions of the driver and the OS there, which target the
_TARGETED_DRIVER_VERSIONS and _TARGETED_OS_VERSIONS dictionaries
in [bot_config.py] (Google internal).
1. File a `Build Infrastructure` bug, component `Infra>Labs`, to have ~4 of
the physical machines already in the Swarming pool upgraded to the new
version of the driver or the OS.
1. If an "experimental" version of this bot doesn't yet exist, follow the
instructions above for [How to add a new tester bot to the chromium.gpu.fyi
waterfall](#How-to-add-a-new-tester-bot-to-the-chromium_gpu_fyi-waterfall)
to deploy one.
1. Have this experimental bot target the new version of the driver in
[waterfalls.pyl] and [mixins.pyl].
1. Have this experimental bot target the new version of the driver or the OS
in [waterfalls.pyl] and [mixins.pyl].
1. Hopefully, the new machine will pass the pixel tests. If it doesn't, then
unfortunately, it'll be necessary to follow the instructions on
[updating the pixel tests] to temporarily suppress the failures on this
......@@ -608,6 +610,7 @@ reliably green before rolling out the driver update. To do this:
1. Watch the new machine for a day or two to make sure it's stable.
1. When it is, update [bot_config.py] (Google internal) to *add* a mapping
between the new driver version and the "stable" version. For example:
```
_TARGETED_DRIVER_VERSIONS = {
# NVIDIA Quadro P400, Ubuntu Stable version
......@@ -618,15 +621,29 @@ reliably green before rolling out the driver update. To do this:
}
```
The new driver version should match the one just added for the
And/or a mapping between the new OS version and the "stable" version.
For example:
```
_TARGETED_OS_VERSIONS = {
# Linux NVIDIA Quadro P400
'10de:1cb3': {
'Ubuntu-14.04': 'linux-nvidia-stable',
'Ubuntu-19.04': 'linux-nvidia-stable',
},
# ...
}
```
The new driver or OS version should match the one just added for the
experimental bot. Get this CL reviewed and landed.
1. After it lands, ask the Chrome Infrastructure Labs team to roll out the
driver update across all of the similarly configured bots in the swarming
pool.
1. If necessary, update pixel test expectations and remove the suppressions
added above.
1. Remove the old driver version from [bot_config.py], leaving the "stable"
driver version pointing at the newly upgraded version.
1. Remove the old driver or OS version from [bot_config.py], leaving the
"stable" driver version pointing at the newly upgraded version.
Note that we leave the experimental bot in place. We could reclaim it, but it
seems worthwhile to continuously test the "next" version of graphics drivers as
......
testing/buildbot/chromium.dawn.json
View file @ 3fbea994
......@@ -19,7 +19,7 @@
"dimension_sets": [
{
"gpu": "intel-hd-630-ubuntu-stable",
"os": "Ubuntu",
"os": "linux-intel-stable",
"pool": "Chrome-GPU"
}
]
......@@ -42,7 +42,7 @@
"dimension_sets": [
{
"gpu": "intel-hd-630-ubuntu-stable",
"os": "Ubuntu",
"os": "linux-intel-stable",
"pool": "Chrome-GPU"
}
]
......@@ -65,7 +65,7 @@
"dimension_sets": [
{
"gpu": "intel-hd-630-ubuntu-stable",
"os": "Ubuntu",
"os": "linux-intel-stable",
"pool": "Chrome-GPU"
}
]
......@@ -86,7 +86,7 @@
"dimension_sets": [
{
"gpu": "intel-hd-630-ubuntu-stable",
"os": "Ubuntu",
"os": "linux-intel-stable",
"pool": "Chrome-GPU"
}
]
......@@ -107,7 +107,7 @@
"dimension_sets": [
{
"gpu": "intel-hd-630-ubuntu-stable",
"os": "Ubuntu",
"os": "linux-intel-stable",
"pool": "Chrome-GPU"
}
]
......@@ -141,7 +141,7 @@
"dimension_sets": [
{
"gpu": "intel-hd-630-ubuntu-stable",
"os": "Ubuntu",
"os": "linux-intel-stable",
"pool": "Chrome-GPU"
}
]
......@@ -165,7 +165,7 @@
"dimension_sets": [
{
"gpu": "nvidia-quadro-p400-ubuntu-stable",
"os": "Ubuntu-14.04",
"os": "linux-nvidia-stable",
"pool": "Chrome-GPU"
}
]
......@@ -188,7 +188,7 @@
"dimension_sets": [
{
"gpu": "nvidia-quadro-p400-ubuntu-stable",
"os": "Ubuntu-14.04",
"os": "linux-nvidia-stable",
"pool": "Chrome-GPU"
}
]
......@@ -211,7 +211,7 @@
"dimension_sets": [
{
"gpu": "nvidia-quadro-p400-ubuntu-stable",
"os": "Ubuntu-14.04",
"os": "linux-nvidia-stable",
"pool": "Chrome-GPU"
}
]
......@@ -232,7 +232,7 @@
"dimension_sets": [
{
"gpu": "nvidia-quadro-p400-ubuntu-stable",
"os": "Ubuntu-14.04",
"os": "linux-nvidia-stable",
"pool": "Chrome-GPU"
}
]
......@@ -253,7 +253,7 @@
"dimension_sets": [
{
"gpu": "nvidia-quadro-p400-ubuntu-stable",
"os": "Ubuntu-14.04",
"os": "linux-nvidia-stable",
"pool": "Chrome-GPU"
}
]
......@@ -287,7 +287,7 @@
"dimension_sets": [
{
"gpu": "nvidia-quadro-p400-ubuntu-stable",
"os": "Ubuntu-14.04",
"os": "linux-nvidia-stable",
"pool": "Chrome-GPU"
}
]
......@@ -311,7 +311,7 @@
"dimension_sets": [
{
"gpu": "intel-hd-630-ubuntu-stable",
"os": "Ubuntu",
"os": "linux-intel-stable",
"pool": "Chrome-GPU"
}
]
......@@ -334,7 +334,7 @@
"dimension_sets": [
{
"gpu": "intel-hd-630-ubuntu-stable",
"os": "Ubuntu",
"os": "linux-intel-stable",
"pool": "Chrome-GPU"
}
]
......@@ -357,7 +357,7 @@
"dimension_sets": [
{
"gpu": "intel-hd-630-ubuntu-stable",
"os": "Ubuntu",
"os": "linux-intel-stable",
"pool": "Chrome-GPU"
}
]
......@@ -382,7 +382,7 @@
"dimension_sets": [
{
"gpu": "nvidia-quadro-p400-ubuntu-stable",
"os": "Ubuntu-14.04",
"os": "linux-nvidia-stable",
"pool": "Chrome-GPU"
}
]
......@@ -405,7 +405,7 @@
"dimension_sets": [
{
"gpu": "nvidia-quadro-p400-ubuntu-stable",
"os": "Ubuntu-14.04",
"os": "linux-nvidia-stable",
"pool": "Chrome-GPU"
}
]
......@@ -428,7 +428,7 @@
"dimension_sets": [
{
"gpu": "nvidia-quadro-p400-ubuntu-stable",
"os": "Ubuntu-14.04",
"os": "linux-nvidia-stable",
"pool": "Chrome-GPU"
}
]
......@@ -456,7 +456,7 @@
{
"gpu": "1002:6821",
"hidpi": "1",
"os": "Mac-10.13.6",
"os": "mac-amd-stable",
"pool": "Chrome-GPU"
}
]
......@@ -480,7 +480,7 @@
{
"gpu": "1002:6821",
"hidpi": "1",
"os": "Mac-10.13.6",
"os": "mac-amd-stable",
"pool": "Chrome-GPU"
}
]
......@@ -504,7 +504,7 @@
{
"gpu": "1002:6821",
"hidpi": "1",
"os": "Mac-10.13.6",
"os": "mac-amd-stable",
"pool": "Chrome-GPU"
}
]
......@@ -526,7 +526,7 @@
{
"gpu": "1002:6821",
"hidpi": "1",
"os": "Mac-10.13.6",
"os": "mac-amd-stable",
"pool": "Chrome-GPU"
}
]
......@@ -547,7 +547,7 @@
{
"gpu": "1002:6821",
"hidpi": "1",
"os": "Mac-10.13.6",
"os": "mac-amd-stable",
"pool": "Chrome-GPU"
}
]
......@@ -581,7 +581,7 @@
{
"gpu": "1002:6821",
"hidpi": "1",
"os": "Mac-10.13.6",
"os": "mac-amd-stable",
"pool": "Chrome-GPU"
}
]
......@@ -605,8 +605,7 @@
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.13.6",
"pool": "Chrome-GPU"
"os": "mac-intel-stable"
}
]
},
......@@ -628,8 +627,7 @@
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.13.6",
"pool": "Chrome-GPU"
"os": "mac-intel-stable"
}
]
},
......@@ -651,8 +649,7 @@
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.13.6",
"pool": "Chrome-GPU"
"os": "mac-intel-stable"
}
]
},
......@@ -672,8 +669,7 @@
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.13.6",
"pool": "Chrome-GPU"
"os": "mac-intel-stable"
}
]
},
......@@ -692,8 +688,7 @@
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.13.6",
"pool": "Chrome-GPU"
"os": "mac-intel-stable"
}
]
},
......@@ -725,8 +720,7 @@
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.13.6",
"pool": "Chrome-GPU"
"os": "mac-intel-stable"
}
]
}
......@@ -750,7 +744,7 @@
{
"gpu": "1002:6821",
"hidpi": "1",
"os": "Mac-10.13.6",
"os": "mac-amd-stable",
"pool": "Chrome-GPU"
}
]
......@@ -774,7 +768,7 @@
{
"gpu": "1002:6821",
"hidpi": "1",
"os": "Mac-10.13.6",
"os": "mac-amd-stable",
"pool": "Chrome-GPU"
}
]
......@@ -798,7 +792,7 @@
{
"gpu": "1002:6821",
"hidpi": "1",
"os": "Mac-10.13.6",
"os": "mac-amd-stable",
"pool": "Chrome-GPU"
}
]
......@@ -823,8 +817,7 @@
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.13.6",
"pool": "Chrome-GPU"
"os": "mac-intel-stable"
}
]
},
......@@ -846,8 +839,7 @@
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.13.6",
"pool": "Chrome-GPU"
"os": "mac-intel-stable"
}
]
},
......@@ -869,8 +861,7 @@
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.13.6",
"pool": "Chrome-GPU"
"os": "mac-intel-stable"
}
]
},
......
testing/buildbot/chromium.gpu.fyi.json
View file @ 3fbea994
This diff is collapsed.
testing/buildbot/chromium.gpu.json
View file @ 3fbea994
This diff is collapsed.
testing/buildbot/client.v8.fyi.json
View file @ 3fbea994
......@@ -399,7 +399,7 @@
"dimension_sets": [
{
"gpu": "nvidia-quadro-p400-ubuntu-stable",
"os": "Ubuntu-14.04",
"os": "linux-nvidia-stable",
"pool": "Chrome-GPU"
}
],
......@@ -427,7 +427,7 @@
"dimension_sets": [
{
"gpu": "nvidia-quadro-p400-ubuntu-stable",
"os": "Ubuntu-14.04",
"os": "linux-nvidia-stable",
"pool": "Chrome-GPU"
}
],
......@@ -455,7 +455,7 @@
"dimension_sets": [
{
"gpu": "nvidia-quadro-p400-ubuntu-stable",
"os": "Ubuntu-14.04",
"os": "linux-nvidia-stable",
"pool": "Chrome-GPU"
}
],
......@@ -483,7 +483,7 @@
"dimension_sets": [
{
"gpu": "nvidia-quadro-p400-ubuntu-stable",
"os": "Ubuntu-14.04",
"os": "linux-nvidia-stable",
"pool": "Chrome-GPU"
}
],
......@@ -518,7 +518,7 @@
"dimension_sets": [
{
"gpu": "nvidia-quadro-p400-ubuntu-stable",
"os": "Ubuntu-14.04",
"os": "linux-nvidia-stable",
"pool": "Chrome-GPU"
}
],
......@@ -570,7 +570,7 @@
"dimension_sets": [
{
"gpu": "nvidia-quadro-p400-ubuntu-stable",
"os": "Ubuntu-14.04",
"os": "linux-nvidia-stable",
"pool": "Chrome-GPU"
}
],
......@@ -614,7 +614,7 @@
"dimension_sets": [
{
"gpu": "nvidia-quadro-p400-ubuntu-stable",
"os": "Ubuntu-14.04",
"os": "linux-nvidia-stable",
"pool": "Chrome-GPU"
}
],
......@@ -643,7 +643,7 @@
"dimension_sets": [
{
"gpu": "nvidia-quadro-p400-ubuntu-stable",
"os": "Ubuntu-14.04",
"os": "linux-nvidia-stable",
"pool": "Chrome-GPU"
}
],
......@@ -671,7 +671,7 @@
"dimension_sets": [
{
"gpu": "nvidia-quadro-p400-ubuntu-stable",
"os": "Ubuntu-14.04",
"os": "linux-nvidia-stable",
"pool": "Chrome-GPU"
}
],
......@@ -701,7 +701,7 @@
"dimension_sets": [
{
"gpu": "nvidia-quadro-p400-ubuntu-stable",
"os": "Ubuntu-14.04",
"os": "linux-nvidia-stable",
"pool": "Chrome-GPU"
}
],
......@@ -730,7 +730,7 @@
"dimension_sets": [
{
"gpu": "nvidia-quadro-p400-ubuntu-stable",
"os": "Ubuntu-14.04",
"os": "linux-nvidia-stable",
"pool": "Chrome-GPU"
}
],
......@@ -763,7 +763,7 @@
"dimension_sets": [
{
"gpu": "nvidia-quadro-p400-ubuntu-stable",
"os": "Ubuntu-14.04",
"os": "linux-nvidia-stable",
"pool": "Chrome-GPU"
}
],
......@@ -791,7 +791,7 @@
"dimension_sets": [
{
"gpu": "nvidia-quadro-p400-ubuntu-stable",
"os": "Ubuntu-14.04",
"os": "linux-nvidia-stable",
"pool": "Chrome-GPU"
}
],
......@@ -819,7 +819,7 @@
"dimension_sets": [
{
"gpu": "nvidia-quadro-p400-ubuntu-stable",
"os": "Ubuntu-14.04",
"os": "linux-nvidia-stable",
"pool": "Chrome-GPU"
}
],
......@@ -847,7 +847,7 @@
"dimension_sets": [
{
"gpu": "nvidia-quadro-p400-ubuntu-stable",
"os": "Ubuntu-14.04",
"os": "linux-nvidia-stable",
"pool": "Chrome-GPU"
}
],
......@@ -882,7 +882,7 @@
"dimension_sets": [
{
"gpu": "nvidia-quadro-p400-ubuntu-stable",
"os": "Ubuntu-14.04",
"os": "linux-nvidia-stable",
"pool": "Chrome-GPU"
}
],
......@@ -934,7 +934,7 @@
"dimension_sets": [
{
"gpu": "nvidia-quadro-p400-ubuntu-stable",
"os": "Ubuntu-14.04",
"os": "linux-nvidia-stable",
"pool": "Chrome-GPU"
}
],
......@@ -978,7 +978,7 @@
"dimension_sets": [
{
"gpu": "nvidia-quadro-p400-ubuntu-stable",
"os": "Ubuntu-14.04",
"os": "linux-nvidia-stable",
"pool": "Chrome-GPU"
}
],
......@@ -1007,7 +1007,7 @@
"dimension_sets": [
{
"gpu": "nvidia-quadro-p400-ubuntu-stable",
"os": "Ubuntu-14.04",
"os": "linux-nvidia-stable",
"pool": "Chrome-GPU"
}
],
......@@ -1035,7 +1035,7 @@
"dimension_sets": [
{
"gpu": "nvidia-quadro-p400-ubuntu-stable",
"os": "Ubuntu-14.04",
"os": "linux-nvidia-stable",
"pool": "Chrome-GPU"
}
],
......@@ -1065,7 +1065,7 @@
"dimension_sets": [
{
"gpu": "nvidia-quadro-p400-ubuntu-stable",
"os": "Ubuntu-14.04",
"os": "linux-nvidia-stable",
"pool": "Chrome-GPU"
}
],
......@@ -1094,7 +1094,7 @@
"dimension_sets": [
{
"gpu": "nvidia-quadro-p400-ubuntu-stable",
"os": "Ubuntu-14.04",
"os": "linux-nvidia-stable",
"pool": "Chrome-GPU"
}
],
......@@ -1127,7 +1127,7 @@
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.13.6"
"os": "mac-intel-stable"
}
],
"idempotent": false
......@@ -1154,7 +1154,7 @@
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.13.6"
"os": "mac-intel-stable"
}
],
"idempotent": false
......@@ -1181,7 +1181,7 @@
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.13.6"
"os": "mac-intel-stable"
}
],
"idempotent": false
......@@ -1208,7 +1208,7 @@
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.13.6"
"os": "mac-intel-stable"
}
],
"idempotent": false
......@@ -1242,7 +1242,7 @@
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.13.6"
"os": "mac-intel-stable"
}
],
"idempotent": false
......@@ -1293,7 +1293,7 @@
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.13.6"
"os": "mac-intel-stable"
}
],
"idempotent": false,
......@@ -1336,7 +1336,7 @@
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.13.6"
"os": "mac-intel-stable"
}
],
"idempotent": false
......@@ -1364,7 +1364,7 @@
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.13.6"
"os": "mac-intel-stable"
}
],
"idempotent": false
......@@ -1391,7 +1391,7 @@
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.13.6"
"os": "mac-intel-stable"
}
],
"idempotent": false
......@@ -1420,7 +1420,7 @@
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.13.6"
"os": "mac-intel-stable"
}
],
"idempotent": false,
......@@ -1448,7 +1448,7 @@
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.13.6"
"os": "mac-intel-stable"
}
],
"idempotent": false,
......
testing/buildbot/mixins.pyl
View file @ 3fbea994
......@@ -273,7 +273,7 @@
'dimensions': {
# Defined in bot_config.py in internal infradata/config workspace
'gpu': 'intel-hd-630-ubuntu-stable',
'os': 'Ubuntu',
'os': 'linux-intel-stable',
'pool': 'Chrome-GPU',
}
}
......@@ -293,7 +293,7 @@
'dimensions': {
# Defined in bot_config.py in internal infradata/config workspace
'gpu': 'nvidia-quadro-p400-ubuntu-stable',
'os': 'Ubuntu-14.04',
'os': 'linux-nvidia-stable',
'pool': 'Chrome-GPU',
}
}
......@@ -380,7 +380,7 @@
'swarming': {
'dimensions': {
'gpu': '8086:0a2e',
'os': 'Mac-10.13.6',
'os': 'mac-intel-stable',
},
},
},
......@@ -407,7 +407,7 @@
'dimensions': {
'gpu': '1002:6821',
'hidpi': '1',
'os': 'Mac-10.13.6',
'os': 'mac-amd-stable',
'pool': 'Chrome-GPU',
},
},
......@@ -428,7 +428,7 @@
'dimensions': {
'gpu': '10de:0fe9',
'hidpi': '1',
'os': 'Mac-10.13.6',
'os': 'mac-nvidia-stable',
'pool': 'Chrome-GPU',
},
},
......
testing/buildbot/waterfalls.pyl
View file @ 3fbea994
......@@ -1137,8 +1137,7 @@
'os_type': 'mac',
'browser_config': 'release',
'mixins': [
# NOTE explicit use of 10.13 for these bots.
'mac_mini_intel_gpu_experimental',
'mac_mini_intel_gpu',
],
'test_suites': {
'gtest_tests': 'gpu_dawn_integration_gtests',
......@@ -1159,8 +1158,7 @@
'os_type': 'mac',
'browser_config': 'release',
'mixins': [
# NOTE explicit use of 10.13 for these bots.
'mac_mini_intel_gpu_experimental',
'mac_mini_intel_gpu',
],
'test_suites': {
'gtest_tests': 'gpu_dawn_gtests',
......@@ -2900,12 +2898,12 @@
# TODO(kbr): figure out how to use mixins for these.
{
'gpu': '8086:0a2e',
'os': 'Mac-10.13.6',
'os': 'mac-intel-stable',
},
{
'gpu': '1002:6821',
'hidpi': '1',
'os': 'Mac-10.13.6',
'os': 'mac-amd-stable',
'pool': 'Chrome-GPU',
},
],
......
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