Specify precise dimensions for Linux NVIDIA machines
Some bots were configured via test_suite_exceptions.pyl,
which wasn't precise enough and caused flakiness.
Bug: 1490444
Change-Id: I744e1b22a51f27940541b53a3d0c738f3c143205
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4922349
Auto-Submit: Yuly Novikov <[email protected]>
Reviewed-by: Brian Sheedy <[email protected]>
Commit-Queue: Brian Sheedy <[email protected]>
Cr-Commit-Position: refs/heads/main@{#1207121}
diff --git a/testing/buildbot/chromium.memory.fyi.json b/testing/buildbot/chromium.memory.fyi.json
index 13de185..b16ecea7 100644
--- a/testing/buildbot/chromium.memory.fyi.json
+++ b/testing/buildbot/chromium.memory.fyi.json
@@ -653,8 +653,8 @@
"name": "gl_tests_passthrough",
"swarming": {
"dimensions": {
- "gpu": "10de:2184",
- "os": "Ubuntu",
+ "gpu": "10de:2184-440.100",
+ "os": "Ubuntu-18.04.5|Ubuntu-18.04.6",
"pool": "chromium.tests.gpu"
},
"service_account": "[email protected]",
@@ -3717,8 +3717,8 @@
"name": "gl_tests_passthrough",
"swarming": {
"dimensions": {
- "gpu": "10de:2184",
- "os": "Ubuntu",
+ "gpu": "10de:2184-440.100",
+ "os": "Ubuntu-18.04.5|Ubuntu-18.04.6",
"pool": "chromium.tests.gpu"
},
"service_account": "[email protected]",
diff --git a/testing/buildbot/chromium.memory.json b/testing/buildbot/chromium.memory.json
index b8cac689..5541a5b 100644
--- a/testing/buildbot/chromium.memory.json
+++ b/testing/buildbot/chromium.memory.json
@@ -653,8 +653,8 @@
"name": "gl_tests_passthrough",
"swarming": {
"dimensions": {
- "gpu": "10de:2184",
- "os": "Ubuntu",
+ "gpu": "10de:2184-440.100",
+ "os": "Ubuntu-18.04.5|Ubuntu-18.04.6",
"pool": "chromium.tests.gpu"
},
"service_account": "[email protected]",
@@ -2063,8 +2063,8 @@
"name": "gl_tests_passthrough",
"swarming": {
"dimensions": {
- "gpu": "10de:2184",
- "os": "Ubuntu",
+ "gpu": "10de:2184-440.100",
+ "os": "Ubuntu-18.04.5|Ubuntu-18.04.6",
"pool": "chromium.tests.gpu"
},
"service_account": "[email protected]",
@@ -8289,8 +8289,8 @@
"name": "gl_tests_passthrough",
"swarming": {
"dimensions": {
- "gpu": "10de:2184",
- "os": "Ubuntu",
+ "gpu": "10de:2184-440.100",
+ "os": "Ubuntu-18.04.5|Ubuntu-18.04.6",
"pool": "chromium.tests.gpu"
},
"service_account": "[email protected]",
diff --git a/testing/buildbot/test_suite_exceptions.pyl b/testing/buildbot/test_suite_exceptions.pyl
index 8711844..eab611e 100644
--- a/testing/buildbot/test_suite_exceptions.pyl
+++ b/testing/buildbot/test_suite_exceptions.pyl
@@ -2793,9 +2793,10 @@
'--no-xvfb',
],
'swarming': {
+ # This must be kept in sync with linux_nvidia_gtx_1660_stable mixin
'dimensions': {
- 'gpu': '10de:2184',
- 'os': 'Ubuntu',
+ 'gpu': '10de:2184-440.100',
+ 'os': 'Ubuntu-18.04.5|Ubuntu-18.04.6',
'pool': 'chromium.tests.gpu',
},
},
@@ -2806,9 +2807,10 @@
'--no-xvfb',
],
'swarming': {
+ # This must be kept in sync with linux_nvidia_gtx_1660_stable mixin
'dimensions': {
- 'gpu': '10de:2184',
- 'os': 'Ubuntu',
+ 'gpu': '10de:2184-440.100',
+ 'os': 'Ubuntu-18.04.5|Ubuntu-18.04.6',
'pool': 'chromium.tests.gpu',
},
},
@@ -2819,9 +2821,10 @@
'--no-xvfb',
],
'swarming': {
+ # This must be kept in sync with linux_nvidia_gtx_1660_stable mixin
'dimensions': {
- 'gpu': '10de:2184',
- 'os': 'Ubuntu',
+ 'gpu': '10de:2184-440.100',
+ 'os': 'Ubuntu-18.04.5|Ubuntu-18.04.6',
'pool': 'chromium.tests.gpu',
},
},
@@ -2832,9 +2835,10 @@
'--no-xvfb',
],
'swarming': {
+ # This must be kept in sync with linux_nvidia_gtx_1660_stable mixin
'dimensions': {
- 'gpu': '10de:2184',
- 'os': 'Ubuntu',
+ 'gpu': '10de:2184-440.100',
+ 'os': 'Ubuntu-18.04.5|Ubuntu-18.04.6',
'pool': 'chromium.tests.gpu',
},
},
@@ -2845,9 +2849,10 @@
'--no-xvfb',
],
'swarming': {
+ # This must be kept in sync with linux_nvidia_gtx_1660_stable mixin
'dimensions': {
- 'gpu': '10de:2184',
- 'os': 'Ubuntu',
+ 'gpu': '10de:2184-440.100',
+ 'os': 'Ubuntu-18.04.5|Ubuntu-18.04.6',
'pool': 'chromium.tests.gpu',
},
},
