Commit f51a1863 authored by Jamie Madill's avatar Jamie Madill Committed by Commit Bot

Add mixin to optionally use upgraded Linux NVIDIA drivers.

This mixin will allow a fallback to the older stable driver version after
ten minutes of failing to find the new driver version.

Bug: 887241
Change-Id: Ieb279babadb6f57441b3c72172f70d4014b2bf8a
Reviewed-on: https://chromium-review.googlesource.com/c/1422838
Commit-Queue: Jamie Madill <jmadill@chromium.org>
Reviewed-by: default avatarKenneth Russell <kbr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#625116}
parent 7e36d42f
This diff is collapsed.
...@@ -297,7 +297,14 @@ ...@@ -297,7 +297,14 @@
"os": "Ubuntu", "os": "Ubuntu",
"pool": "Chrome-GPU" "pool": "Chrome-GPU"
} }
] ],
"optional_dimensions": {
"600": [
{
"gpu": "10de:1cb3-410.78"
}
]
}
}, },
"test": "angle_unittests" "test": "angle_unittests"
}, },
...@@ -314,7 +321,14 @@ ...@@ -314,7 +321,14 @@
"os": "Ubuntu", "os": "Ubuntu",
"pool": "Chrome-GPU" "pool": "Chrome-GPU"
} }
] ],
"optional_dimensions": {
"600": [
{
"gpu": "10de:1cb3-410.78"
}
]
}
}, },
"test": "gl_tests" "test": "gl_tests"
}, },
...@@ -331,7 +345,14 @@ ...@@ -331,7 +345,14 @@
"os": "Ubuntu", "os": "Ubuntu",
"pool": "Chrome-GPU" "pool": "Chrome-GPU"
} }
] ],
"optional_dimensions": {
"600": [
{
"gpu": "10de:1cb3-410.78"
}
]
}
}, },
"test": "gl_unittests" "test": "gl_unittests"
} }
...@@ -358,7 +379,14 @@ ...@@ -358,7 +379,14 @@
"pool": "Chrome-GPU" "pool": "Chrome-GPU"
} }
], ],
"idempotent": false "idempotent": false,
"optional_dimensions": {
"600": [
{
"gpu": "10de:1cb3-410.78"
}
]
}
} }
}, },
{ {
...@@ -382,7 +410,14 @@ ...@@ -382,7 +410,14 @@
"pool": "Chrome-GPU" "pool": "Chrome-GPU"
} }
], ],
"idempotent": false "idempotent": false,
"optional_dimensions": {
"600": [
{
"gpu": "10de:1cb3-410.78"
}
]
}
} }
}, },
{ {
...@@ -406,7 +441,14 @@ ...@@ -406,7 +441,14 @@
"pool": "Chrome-GPU" "pool": "Chrome-GPU"
} }
], ],
"idempotent": false "idempotent": false,
"optional_dimensions": {
"600": [
{
"gpu": "10de:1cb3-410.78"
}
]
}
} }
}, },
{ {
...@@ -430,7 +472,14 @@ ...@@ -430,7 +472,14 @@
"pool": "Chrome-GPU" "pool": "Chrome-GPU"
} }
], ],
"idempotent": false "idempotent": false,
"optional_dimensions": {
"600": [
{
"gpu": "10de:1cb3-410.78"
}
]
}
} }
}, },
{ {
...@@ -458,7 +507,14 @@ ...@@ -458,7 +507,14 @@
"pool": "Chrome-GPU" "pool": "Chrome-GPU"
} }
], ],
"idempotent": false "idempotent": false,
"optional_dimensions": {
"600": [
{
"gpu": "10de:1cb3-410.78"
}
]
}
} }
}, },
{ {
...@@ -489,7 +545,14 @@ ...@@ -489,7 +545,14 @@
"pool": "Chrome-GPU" "pool": "Chrome-GPU"
} }
], ],
"idempotent": false "idempotent": false,
"optional_dimensions": {
"600": [
{
"gpu": "10de:1cb3-410.78"
}
]
}
} }
}, },
{ {
...@@ -528,7 +591,14 @@ ...@@ -528,7 +591,14 @@
"pool": "Chrome-GPU" "pool": "Chrome-GPU"
} }
], ],
"idempotent": false "idempotent": false,
"optional_dimensions": {
"600": [
{
"gpu": "10de:1cb3-410.78"
}
]
}
} }
}, },
{ {
...@@ -553,7 +623,14 @@ ...@@ -553,7 +623,14 @@
"pool": "Chrome-GPU" "pool": "Chrome-GPU"
} }
], ],
"idempotent": false "idempotent": false,
"optional_dimensions": {
"600": [
{
"gpu": "10de:1cb3-410.78"
}
]
}
} }
}, },
{ {
...@@ -577,7 +654,14 @@ ...@@ -577,7 +654,14 @@
"pool": "Chrome-GPU" "pool": "Chrome-GPU"
} }
], ],
"idempotent": false "idempotent": false,
"optional_dimensions": {
"600": [
{
"gpu": "10de:1cb3-410.78"
}
]
}
} }
}, },
{ {
...@@ -602,6 +686,13 @@ ...@@ -602,6 +686,13 @@
} }
], ],
"idempotent": false, "idempotent": false,
"optional_dimensions": {
"600": [
{
"gpu": "10de:1cb3-410.78"
}
]
},
"shards": 2 "shards": 2
} }
} }
...@@ -624,7 +715,14 @@ ...@@ -624,7 +715,14 @@
"os": "Ubuntu", "os": "Ubuntu",
"pool": "Chrome-GPU" "pool": "Chrome-GPU"
} }
] ],
"optional_dimensions": {
"600": [
{
"gpu": "10de:1cb3-410.78"
}
]
}
}, },
"test": "angle_unittests" "test": "angle_unittests"
}, },
...@@ -645,7 +743,14 @@ ...@@ -645,7 +743,14 @@
"os": "Ubuntu", "os": "Ubuntu",
"pool": "Chrome-GPU" "pool": "Chrome-GPU"
} }
] ],
"optional_dimensions": {
"600": [
{
"gpu": "10de:1cb3-410.78"
}
]
}
}, },
"test": "browser_tests" "test": "browser_tests"
}, },
...@@ -662,7 +767,14 @@ ...@@ -662,7 +767,14 @@
"os": "Ubuntu", "os": "Ubuntu",
"pool": "Chrome-GPU" "pool": "Chrome-GPU"
} }
] ],
"optional_dimensions": {
"600": [
{
"gpu": "10de:1cb3-410.78"
}
]
}
}, },
"test": "gl_tests" "test": "gl_tests"
}, },
...@@ -679,7 +791,14 @@ ...@@ -679,7 +791,14 @@
"os": "Ubuntu", "os": "Ubuntu",
"pool": "Chrome-GPU" "pool": "Chrome-GPU"
} }
] ],
"optional_dimensions": {
"600": [
{
"gpu": "10de:1cb3-410.78"
}
]
}
}, },
"test": "gl_unittests" "test": "gl_unittests"
} }
...@@ -706,7 +825,14 @@ ...@@ -706,7 +825,14 @@
"pool": "Chrome-GPU" "pool": "Chrome-GPU"
} }
], ],
"idempotent": false "idempotent": false,
"optional_dimensions": {
"600": [
{
"gpu": "10de:1cb3-410.78"
}
]
}
} }
}, },
{ {
...@@ -730,7 +856,14 @@ ...@@ -730,7 +856,14 @@
"pool": "Chrome-GPU" "pool": "Chrome-GPU"
} }
], ],
"idempotent": false "idempotent": false,
"optional_dimensions": {
"600": [
{
"gpu": "10de:1cb3-410.78"
}
]
}
} }
}, },
{ {
...@@ -754,7 +887,14 @@ ...@@ -754,7 +887,14 @@
"pool": "Chrome-GPU" "pool": "Chrome-GPU"
} }
], ],
"idempotent": false "idempotent": false,
"optional_dimensions": {
"600": [
{
"gpu": "10de:1cb3-410.78"
}
]
}
} }
}, },
{ {
...@@ -778,7 +918,14 @@ ...@@ -778,7 +918,14 @@
"pool": "Chrome-GPU" "pool": "Chrome-GPU"
} }
], ],
"idempotent": false "idempotent": false,
"optional_dimensions": {
"600": [
{
"gpu": "10de:1cb3-410.78"
}
]
}
} }
}, },
{ {
...@@ -806,7 +953,14 @@ ...@@ -806,7 +953,14 @@
"pool": "Chrome-GPU" "pool": "Chrome-GPU"
} }
], ],
"idempotent": false "idempotent": false,
"optional_dimensions": {
"600": [
{
"gpu": "10de:1cb3-410.78"
}
]
}
} }
}, },
{ {
...@@ -837,7 +991,14 @@ ...@@ -837,7 +991,14 @@
"pool": "Chrome-GPU" "pool": "Chrome-GPU"
} }
], ],
"idempotent": false "idempotent": false,
"optional_dimensions": {
"600": [
{
"gpu": "10de:1cb3-410.78"
}
]
}
} }
}, },
{ {
...@@ -876,7 +1037,14 @@ ...@@ -876,7 +1037,14 @@
"pool": "Chrome-GPU" "pool": "Chrome-GPU"
} }
], ],
"idempotent": false "idempotent": false,
"optional_dimensions": {
"600": [
{
"gpu": "10de:1cb3-410.78"
}
]
}
} }
}, },
{ {
...@@ -901,7 +1069,14 @@ ...@@ -901,7 +1069,14 @@
"pool": "Chrome-GPU" "pool": "Chrome-GPU"
} }
], ],
"idempotent": false "idempotent": false,
"optional_dimensions": {
"600": [
{
"gpu": "10de:1cb3-410.78"
}
]
}
} }
}, },
{ {
...@@ -925,7 +1100,14 @@ ...@@ -925,7 +1100,14 @@
"pool": "Chrome-GPU" "pool": "Chrome-GPU"
} }
], ],
"idempotent": false "idempotent": false,
"optional_dimensions": {
"600": [
{
"gpu": "10de:1cb3-410.78"
}
]
}
} }
}, },
{ {
...@@ -950,6 +1132,13 @@ ...@@ -950,6 +1132,13 @@
} }
], ],
"idempotent": false, "idempotent": false,
"optional_dimensions": {
"600": [
{
"gpu": "10de:1cb3-410.78"
}
]
},
"shards": 2 "shards": 2
} }
} }
......
...@@ -295,7 +295,14 @@ ...@@ -295,7 +295,14 @@
"pool": "Chrome-GPU" "pool": "Chrome-GPU"
} }
], ],
"idempotent": false "idempotent": false,
"optional_dimensions": {
"600": [
{
"gpu": "10de:1cb3-410.78"
}
]
}
} }
}, },
{ {
...@@ -319,7 +326,14 @@ ...@@ -319,7 +326,14 @@
"pool": "Chrome-GPU" "pool": "Chrome-GPU"
} }
], ],
"idempotent": false "idempotent": false,
"optional_dimensions": {
"600": [
{
"gpu": "10de:1cb3-410.78"
}
]
}
} }
}, },
{ {
...@@ -343,7 +357,14 @@ ...@@ -343,7 +357,14 @@
"pool": "Chrome-GPU" "pool": "Chrome-GPU"
} }
], ],
"idempotent": false "idempotent": false,
"optional_dimensions": {
"600": [
{
"gpu": "10de:1cb3-410.78"
}
]
}
} }
}, },
{ {
...@@ -367,7 +388,14 @@ ...@@ -367,7 +388,14 @@
"pool": "Chrome-GPU" "pool": "Chrome-GPU"
} }
], ],
"idempotent": false "idempotent": false,
"optional_dimensions": {
"600": [
{
"gpu": "10de:1cb3-410.78"
}
]
}
} }
}, },
{ {
...@@ -398,7 +426,14 @@ ...@@ -398,7 +426,14 @@
"pool": "Chrome-GPU" "pool": "Chrome-GPU"
} }
], ],
"idempotent": false "idempotent": false,
"optional_dimensions": {
"600": [
{
"gpu": "10de:1cb3-410.78"
}
]
}
} }
}, },
{ {
...@@ -437,7 +472,14 @@ ...@@ -437,7 +472,14 @@
"pool": "Chrome-GPU" "pool": "Chrome-GPU"
} }
], ],
"idempotent": false "idempotent": false,
"optional_dimensions": {
"600": [
{
"gpu": "10de:1cb3-410.78"
}
]
}
} }
}, },
{ {
...@@ -462,7 +504,14 @@ ...@@ -462,7 +504,14 @@
"pool": "Chrome-GPU" "pool": "Chrome-GPU"
} }
], ],
"idempotent": false "idempotent": false,
"optional_dimensions": {
"600": [
{
"gpu": "10de:1cb3-410.78"
}
]
}
} }
}, },
{ {
...@@ -486,7 +535,14 @@ ...@@ -486,7 +535,14 @@
"pool": "Chrome-GPU" "pool": "Chrome-GPU"
} }
], ],
"idempotent": false "idempotent": false,
"optional_dimensions": {
"600": [
{
"gpu": "10de:1cb3-410.78"
}
]
}
} }
}, },
{ {
...@@ -513,6 +569,13 @@ ...@@ -513,6 +569,13 @@
} }
], ],
"idempotent": false, "idempotent": false,
"optional_dimensions": {
"600": [
{
"gpu": "10de:1cb3-410.78"
}
]
},
"shards": 20 "shards": 20
} }
}, },
...@@ -538,6 +601,13 @@ ...@@ -538,6 +601,13 @@
} }
], ],
"idempotent": false, "idempotent": false,
"optional_dimensions": {
"600": [
{
"gpu": "10de:1cb3-410.78"
}
]
},
"shards": 2 "shards": 2
} }
} }
...@@ -566,7 +636,14 @@ ...@@ -566,7 +636,14 @@
"pool": "Chrome-GPU" "pool": "Chrome-GPU"
} }
], ],
"idempotent": false "idempotent": false,
"optional_dimensions": {
"600": [
{
"gpu": "10de:1cb3-410.78"
}
]
}
} }
}, },
{ {
...@@ -590,7 +667,14 @@ ...@@ -590,7 +667,14 @@
"pool": "Chrome-GPU" "pool": "Chrome-GPU"
} }
], ],
"idempotent": false "idempotent": false,
"optional_dimensions": {
"600": [
{
"gpu": "10de:1cb3-410.78"
}
]
}
} }
}, },
{ {
...@@ -614,7 +698,14 @@ ...@@ -614,7 +698,14 @@
"pool": "Chrome-GPU" "pool": "Chrome-GPU"
} }
], ],
"idempotent": false "idempotent": false,
"optional_dimensions": {
"600": [
{
"gpu": "10de:1cb3-410.78"
}
]
}
} }
}, },
{ {
...@@ -638,7 +729,14 @@ ...@@ -638,7 +729,14 @@
"pool": "Chrome-GPU" "pool": "Chrome-GPU"
} }
], ],
"idempotent": false "idempotent": false,
"optional_dimensions": {
"600": [
{
"gpu": "10de:1cb3-410.78"
}
]
}
} }
}, },
{ {
...@@ -669,7 +767,14 @@ ...@@ -669,7 +767,14 @@
"pool": "Chrome-GPU" "pool": "Chrome-GPU"
} }
], ],
"idempotent": false "idempotent": false,
"optional_dimensions": {
"600": [
{
"gpu": "10de:1cb3-410.78"
}
]
}
} }
}, },
{ {
...@@ -708,7 +813,14 @@ ...@@ -708,7 +813,14 @@
"pool": "Chrome-GPU" "pool": "Chrome-GPU"
} }
], ],
"idempotent": false "idempotent": false,
"optional_dimensions": {
"600": [
{
"gpu": "10de:1cb3-410.78"
}
]
}
} }
}, },
{ {
...@@ -733,7 +845,14 @@ ...@@ -733,7 +845,14 @@
"pool": "Chrome-GPU" "pool": "Chrome-GPU"
} }
], ],
"idempotent": false "idempotent": false,
"optional_dimensions": {
"600": [
{
"gpu": "10de:1cb3-410.78"
}
]
}
} }
}, },
{ {
...@@ -757,7 +876,14 @@ ...@@ -757,7 +876,14 @@
"pool": "Chrome-GPU" "pool": "Chrome-GPU"
} }
], ],
"idempotent": false "idempotent": false,
"optional_dimensions": {
"600": [
{
"gpu": "10de:1cb3-410.78"
}
]
}
} }
}, },
{ {
...@@ -784,6 +910,13 @@ ...@@ -784,6 +910,13 @@
} }
], ],
"idempotent": false, "idempotent": false,
"optional_dimensions": {
"600": [
{
"gpu": "10de:1cb3-410.78"
}
]
},
"shards": 20 "shards": 20
} }
}, },
...@@ -809,6 +942,13 @@ ...@@ -809,6 +942,13 @@
} }
], ],
"idempotent": false, "idempotent": false,
"optional_dimensions": {
"600": [
{
"gpu": "10de:1cb3-410.78"
}
]
},
"shards": 2 "shards": 2
} }
} }
......
...@@ -273,6 +273,21 @@ ...@@ -273,6 +273,21 @@
}, },
}, },
}, },
# TODO(jmadill): Remove this after upgrade. http://crbug.com/887241
'linux_nvidia_quadro_p400_upgrade': {
'swarming': {
'optional_dimensions': {
# Wait 10 minutes for this new driver version and then fall back to the
# current "stable" driver version. The format for optional dimensions
# is: expiration: [{key, value}, ..].
600: [
{
'gpu': '10de:1cb3-410.78',
}
],
},
}
},
'lollipop': { 'lollipop': {
'swarming': { 'swarming': {
'dimensions': { 'dimensions': {
......
...@@ -1793,6 +1793,7 @@ ...@@ -1793,6 +1793,7 @@
'os_type': 'linux', 'os_type': 'linux',
'mixins': [ 'mixins': [
'linux_nvidia_quadro_p400', 'linux_nvidia_quadro_p400',
'linux_nvidia_quadro_p400_upgrade',
], ],
'test_suites': { 'test_suites': {
'gtest_tests': 'gpu_desktop_gtests', 'gtest_tests': 'gpu_desktop_gtests',
...@@ -1804,6 +1805,7 @@ ...@@ -1804,6 +1805,7 @@
'os_type': 'linux', 'os_type': 'linux',
'mixins': [ 'mixins': [
'linux_nvidia_quadro_p400', 'linux_nvidia_quadro_p400',
'linux_nvidia_quadro_p400_upgrade',
], ],
'test_suites': { 'test_suites': {
'gtest_tests': 'gpu_desktop_gtests', 'gtest_tests': 'gpu_desktop_gtests',
...@@ -2177,6 +2179,7 @@ ...@@ -2177,6 +2179,7 @@
'browser_config': 'release', 'browser_config': 'release',
'mixins': [ 'mixins': [
'linux_nvidia_quadro_p400', 'linux_nvidia_quadro_p400',
'linux_nvidia_quadro_p400_upgrade',
], ],
'test_suites': { 'test_suites': {
'gtest_tests': 'gpu_dawn_end2end_tests', 'gtest_tests': 'gpu_dawn_end2end_tests',
...@@ -2251,6 +2254,7 @@ ...@@ -2251,6 +2254,7 @@
'os_type': 'linux', 'os_type': 'linux',
'mixins': [ 'mixins': [
'linux_nvidia_quadro_p400', 'linux_nvidia_quadro_p400',
'linux_nvidia_quadro_p400_upgrade',
], ],
'test_suites': { 'test_suites': {
'gtest_tests': 'gpu_fyi_linux_debug_gtests', 'gtest_tests': 'gpu_fyi_linux_debug_gtests',
...@@ -2275,6 +2279,7 @@ ...@@ -2275,6 +2279,7 @@
'os_type': 'linux', 'os_type': 'linux',
'mixins': [ 'mixins': [
'linux_nvidia_quadro_p400', 'linux_nvidia_quadro_p400',
'linux_nvidia_quadro_p400_upgrade',
], ],
'test_suites': { 'test_suites': {
# This bot doesn't run any browser-based tests # This bot doesn't run any browser-based tests
...@@ -2325,6 +2330,7 @@ ...@@ -2325,6 +2330,7 @@
'browser_config': 'release', 'browser_config': 'release',
'mixins': [ 'mixins': [
'linux_nvidia_quadro_p400', 'linux_nvidia_quadro_p400',
'linux_nvidia_quadro_p400_upgrade',
], ],
'test_suites': { 'test_suites': {
'gtest_tests': 'gpu_fyi_linux_release_gtests', 'gtest_tests': 'gpu_fyi_linux_release_gtests',
...@@ -2347,6 +2353,7 @@ ...@@ -2347,6 +2353,7 @@
'browser_config': 'release', 'browser_config': 'release',
'mixins': [ 'mixins': [
'linux_nvidia_quadro_p400', 'linux_nvidia_quadro_p400',
'linux_nvidia_quadro_p400_upgrade',
], ],
'test_suites': { 'test_suites': {
'gtest_tests': 'gpu_angle_deqp_linux_nvidia_gtests', 'gtest_tests': 'gpu_angle_deqp_linux_nvidia_gtests',
...@@ -2582,6 +2589,7 @@ ...@@ -2582,6 +2589,7 @@
'browser_config': 'release', 'browser_config': 'release',
'mixins': [ 'mixins': [
'linux_nvidia_quadro_p400', 'linux_nvidia_quadro_p400',
'linux_nvidia_quadro_p400_upgrade',
], ],
'test_suites': { 'test_suites': {
'gtest_tests': 'gpu_fyi_linux_optional_gtests', 'gtest_tests': 'gpu_fyi_linux_optional_gtests',
...@@ -3678,6 +3686,7 @@ ...@@ -3678,6 +3686,7 @@
'browser_config': 'release', 'browser_config': 'release',
'mixins': [ 'mixins': [
'linux_nvidia_quadro_p400', 'linux_nvidia_quadro_p400',
'linux_nvidia_quadro_p400_upgrade',
], ],
'test_suites': { 'test_suites': {
'gpu_telemetry_tests': 'gpu_v8_desktop_telemetry_tests', 'gpu_telemetry_tests': 'gpu_v8_desktop_telemetry_tests',
...@@ -3688,6 +3697,7 @@ ...@@ -3688,6 +3697,7 @@
'browser_config': 'release', 'browser_config': 'release',
'mixins': [ 'mixins': [
'linux_nvidia_quadro_p400', 'linux_nvidia_quadro_p400',
'linux_nvidia_quadro_p400_upgrade',
], ],
'test_suites': { 'test_suites': {
'gpu_telemetry_tests': 'gpu_v8_desktop_telemetry_tests', 'gpu_telemetry_tests': 'gpu_v8_desktop_telemetry_tests',
......
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