Skip to content

GitLab

T
tangled
Commit 73c3bd8b authored by Kenneth Russell's avatar Kenneth Russell Committed by Commit Bot
Browse files
Options

Use mixins for GPU bot configurations. 

Define and use mixins for the most common GPU bot configurations. To
avoid errors and differences between machines, in most of these mixins,
parameters like the OS have been flattened in.

Use these mixins on the chromium.gpu, chromium.gpu.fyi, and
client.v8.fyi waterfalls.

This CL is essentially a no-op; it only modifies a few timeouts due to
unification under the mixin "limited_capacity_bot".

Bug: 895815
Change-Id: Ia9da945d73720ea70ebb4983808eb23463ee1108
Reviewed-on: https://chromium-review.googlesource.com/c/1287431Reviewed-by: default avatarStephen Martinis <martiniss@chromium.org>
Commit-Queue: Kenneth Russell <kbr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#601324}
parent 3ac55499
Hide whitespace changes
Inline Side-by-side
Showing with 586 additions and 785 deletions
testing/buildbot/chromium.gpu.fyi.json
View file @ 73c3bd8b
......@@ -4147,7 +4147,7 @@
"pool": "Chrome-GPU"
}
],
"expiration": 10800
"expiration": 21600
},
"test": "angle_unittests"
},
......@@ -4164,7 +4164,7 @@
"pool": "Chrome-GPU"
}
],
"expiration": 10800
"expiration": 21600
},
"test": "angle_white_box_tests"
},
......@@ -4186,7 +4186,7 @@
"pool": "Chrome-GPU"
}
],
"expiration": 10800
"expiration": 21600
},
"test": "browser_tests"
},
......@@ -4204,7 +4204,7 @@
"pool": "Chrome-GPU"
}
],
"expiration": 10800
"expiration": 21600
},
"test": "gl_tests"
},
......@@ -4221,7 +4221,7 @@
"pool": "Chrome-GPU"
}
],
"expiration": 10800
"expiration": 21600
},
"test": "gles2_conform_test"
},
......@@ -4235,7 +4235,7 @@
"pool": "Chrome-GPU"
}
],
"expiration": 10800
"expiration": 21600
},
"test": "swiftshader_unittests"
}
......@@ -4261,7 +4261,7 @@
"pool": "Chrome-GPU"
}
],
"expiration": 10800,
"expiration": 21600,
"idempotent": false
}
},
......@@ -4285,7 +4285,7 @@
"pool": "Chrome-GPU"
}
],
"expiration": 10800,
"expiration": 21600,
"idempotent": false
}
},
......@@ -4309,7 +4309,7 @@
"pool": "Chrome-GPU"
}
],
"expiration": 10800,
"expiration": 21600,
"idempotent": false
}
},
......@@ -4333,7 +4333,7 @@
"pool": "Chrome-GPU"
}
],
"expiration": 10800,
"expiration": 21600,
"idempotent": false
}
},
......@@ -4361,7 +4361,7 @@
"pool": "Chrome-GPU"
}
],
"expiration": 10800,
"expiration": 21600,
"idempotent": false
}
},
......@@ -4392,7 +4392,7 @@
"pool": "Chrome-GPU"
}
],
"expiration": 10800,
"expiration": 21600,
"idempotent": false
}
},
......@@ -4431,7 +4431,7 @@
"pool": "Chrome-GPU"
}
],
"expiration": 10800,
"expiration": 21600,
"idempotent": false
}
},
......@@ -4456,7 +4456,7 @@
"pool": "Chrome-GPU"
}
],
"expiration": 10800,
"expiration": 21600,
"idempotent": false
}
},
......@@ -4480,7 +4480,7 @@
"pool": "Chrome-GPU"
}
],
"expiration": 10800,
"expiration": 21600,
"idempotent": false
}
},
......@@ -4506,7 +4506,7 @@
"pool": "Chrome-GPU"
}
],
"expiration": 10800,
"expiration": 21600,
"idempotent": false,
"shards": 20
}
......@@ -4531,7 +4531,7 @@
"pool": "Chrome-GPU"
}
],
"expiration": 10800,
"expiration": 21600,
"idempotent": false,
"shards": 2
}
......@@ -4556,7 +4556,7 @@
"pool": "Chrome-GPU"
}
],
"expiration": 10800,
"expiration": 21600,
"idempotent": false,
"shards": 2
}
......@@ -11504,7 +11504,7 @@
"pool": "Chrome-GPU"
}
],
"expiration": 10800,
"expiration": 21600,
"shards": 4
},
"test": "angle_end2end_tests"
......@@ -11523,7 +11523,7 @@
"pool": "Chrome-GPU"
}
],
"expiration": 10800
"expiration": 21600
},
"test": "angle_unittests"
},
......@@ -11544,7 +11544,7 @@
"pool": "Chrome-GPU"
}
],
"expiration": 10800
"expiration": 21600
},
"test": "browser_tests"
},
......@@ -11562,7 +11562,7 @@
"pool": "Chrome-GPU"
}
],
"expiration": 10800
"expiration": 21600
},
"test": "gl_tests"
},
......@@ -11579,7 +11579,7 @@
"pool": "Chrome-GPU"
}
],
"expiration": 10800
"expiration": 21600
},
"test": "gl_unittests"
},
......@@ -11596,7 +11596,7 @@
"pool": "Chrome-GPU"
}
],
"expiration": 10800
"expiration": 21600
},
"test": "gles2_conform_test"
},
......@@ -11610,7 +11610,7 @@
"pool": "Chrome-GPU"
}
],
"expiration": 10800
"expiration": 21600
},
"test": "gpu_unittests"
}
......@@ -11636,7 +11636,7 @@
"pool": "Chrome-GPU"
}
],
"expiration": 10800,
"expiration": 21600,
"idempotent": false
}
},
......@@ -11660,7 +11660,7 @@
"pool": "Chrome-GPU"
}
],
"expiration": 10800,
"expiration": 21600,
"idempotent": false
}
},
......@@ -11684,7 +11684,7 @@
"pool": "Chrome-GPU"
}
],
"expiration": 10800,
"expiration": 21600,
"idempotent": false
}
},
......@@ -11708,7 +11708,7 @@
"pool": "Chrome-GPU"
}
],
"expiration": 10800,
"expiration": 21600,
"idempotent": false
}
},
......@@ -11736,7 +11736,7 @@
"pool": "Chrome-GPU"
}
],
"expiration": 10800,
"expiration": 21600,
"idempotent": false
}
},
......@@ -11767,7 +11767,7 @@
"pool": "Chrome-GPU"
}
],
"expiration": 10800,
"expiration": 21600,
"idempotent": false
}
},
......@@ -11806,7 +11806,7 @@
"pool": "Chrome-GPU"
}
],
"expiration": 10800,
"expiration": 21600,
"idempotent": false
}
},
......@@ -11831,7 +11831,7 @@
"pool": "Chrome-GPU"
}
],
"expiration": 10800,
"expiration": 21600,
"idempotent": false
}
},
......@@ -11855,7 +11855,7 @@
"pool": "Chrome-GPU"
}
],
"expiration": 10800,
"expiration": 21600,
"idempotent": false
}
},
......@@ -11881,7 +11881,7 @@
"pool": "Chrome-GPU"
}
],
"expiration": 10800,
"expiration": 21600,
"idempotent": false,
"shards": 20
}
......@@ -11906,7 +11906,7 @@
"pool": "Chrome-GPU"
}
],
"expiration": 10800,
"expiration": 21600,
"idempotent": false,
"shards": 2
}
......
testing/buildbot/generate_buildbot_json.py
View file @ 73c3bd8b
......@@ -435,11 +435,13 @@ class BBJSONGenerator(object):
def add_common_test_properties(self, test, tester_config):
if tester_config.get('use_multi_dimension_trigger_script'):
# Assumes update_and_cleanup_test has already been called, so the
# builder's mixins have been flattened into the test.
test['trigger_script'] = {
'script': '//testing/trigger_scripts/trigger_multiple_dimensions.py',
'args': [
'--multiple-trigger-configs',
json.dumps(tester_config['swarming']['dimension_sets'] +
json.dumps(test['swarming']['dimension_sets'] +
tester_config.get('alternate_swarming_dimensions', [])),
'--multiple-dimension-script-verbose',
'True'
......
testing/buildbot/generate_buildbot_json_unittest.py
View file @ 73c3bd8b
......@@ -40,6 +40,19 @@ class FakeBBGen(generate_buildbot_json.BBJSONGenerator):
def write_file(self, relative_path, contents):
self.files[relative_path] = contents
# pragma pylint: disable=arguments-differ
def check_output_file_consistency(self, verbose=False, dump=True):
try:
super(FakeBBGen, self).check_output_file_consistency(verbose)
except generate_buildbot_json.BBGenErr:
if verbose and dump:
# Assume we want to see the difference in the waterfalls'
# generated output to make it easier to rebaseline the test.
for line in self.printed_lines:
print line
raise
# pragma pylint: enable=arguments-differ
FOO_GTESTS_WATERFALL = """\
[
......@@ -1366,7 +1379,8 @@ MULTI_DIMENSION_OUTPUT = """\
"trigger_script": {
"args": [
"--multiple-trigger-configs",
"[{\\"gpu\\": \\"none\\", \\"os\\": \\"1\\"}, \
"[{\\"gpu\\": \\"none\\", \\"integrity\\": \\"high\\", \
\\"os\\": \\"1\\"}, \
{\\"gpu\\": \\"none\\", \\"os\\": \\"2\\"}]",
"--multiple-dimension-script-verbose",
"True"
......@@ -2145,7 +2159,7 @@ class UnitTest(unittest.TestCase):
fbb.files['chromium.test.json'] = (
'\n' + COMPOSITION_WATERFALL_FILTERED_OUTPUT)
with self.assertRaises(generate_buildbot_json.BBGenErr):
fbb.check_output_file_consistency(verbose=True)
fbb.check_output_file_consistency(verbose=True, dump=False)
joined_lines = ' '.join(fbb.printed_lines)
self.assertRegexpMatches(
joined_lines, 'Waterfall chromium.test did not have the following'
......
testing/buildbot/mixins.pyl
View file @ 73c3bd8b
......@@ -120,6 +120,15 @@
},
},
},
'angler': {
# Nexus 6P
'swarming': {
'dimensions': {
'device_type': 'angler',
'os': 'Android',
},
},
},
'arm_tester': {
'swarming': {
'dimensions': {
......@@ -135,6 +144,24 @@
},
},
},
'flounder': {
# Nexus 9
'swarming': {
'dimensions': {
'device_type': 'flounder',
'os': 'Android',
},
},
},
'foster': {
# NVIDIA SHIELD TV
'swarming': {
'dimensions': {
'device_type': 'foster',
'os': 'Android',
},
},
},
'gpu_pool': {
'swarming': {
'dimensions': {
......@@ -143,6 +170,7 @@
},
},
'hammerhead': {
# Nexus 5
'swarming': {
'dimensions': {
'device_type': 'hammerhead',
......@@ -184,6 +212,49 @@
},
},
},
'linux_amd_r7_240': {
'swarming': {
'dimensions': {
'gpu': '1002:6613',
'os': 'Ubuntu',
'pool': 'Chrome-GPU',
},
},
},
'linux_intel_hd_530': {
'swarming': {
'dimensions': {
'gpu': '8086:1912',
'os': 'Ubuntu',
'pool': 'Chrome-GPU',
}
}
},
'linux_intel_hd_630': {
'swarming': {
'dimensions': {
'gpu': '8086:5912',
'os': 'Ubuntu',
'pool': 'Chrome-GPU',
}
}
},
'linux_nvidia_quadro_p400': {
'swarming': {
'dimensions': {
'gpu': '10de:1cb3-384.90',
'os': 'Ubuntu',
'pool': 'Chrome-GPU',
}
}
},
'lollipop': {
'swarming': {
'dimensions': {
'device_os': 'L',
},
},
},
'mac-rel-args': {
'args': [
'mac-release/sizes',
......@@ -225,6 +296,83 @@
},
},
},
'mac_mini_intel_gpu': {
'swarming': {
'dimensions': {
'gpu': '8086:0a2e',
'os': 'Mac-10.12.6',
},
},
},
'mac_mini_intel_gpu_experimental': {
'swarming': {
'dimensions': {
'gpu': '8086:0a2e',
'os': 'Mac-10.13.6',
'pool': 'Chrome-GPU',
},
},
},
'mac_pro_amd_gpu': {
'swarming': {
'dimensions': {
'gpu': '1002:679e',
'os': 'Mac-10.12',
'pool': 'Chrome-GPU',
},
},
},
'mac_retina_amd_gpu': {
'swarming': {
'dimensions': {
'gpu': '1002:6821',
'hidpi': '1',
'os': 'Mac-10.13.6',
'pool': 'Chrome-GPU',
},
},
},
'mac_retina_amd_gpu_experimental': {
# Currently same configuration as stable version above.
'swarming': {
'dimensions': {
'gpu': '1002:6821',
'hidpi': '1',
'os': 'Mac-10.13.6',
'pool': 'Chrome-GPU',
},
},
},
'mac_retina_nvidia_gpu': {
'swarming': {
'dimensions': {
'gpu': '10de:0fe9',
'hidpi': '1',
'os': 'Mac-10.13.6',
'pool': 'Chrome-GPU',
},
},
},
'mac_retina_nvidia_gpu_experimental': {
# Currently the same as the stable version.
'swarming': {
'dimensions': {
'gpu': '10de:0fe9',
'hidpi': '1',
'os': 'Mac-10.13.6',
'pool': 'Chrome-GPU',
},
},
},
'marlin': {
# Pixel XL
'swarming': {
'dimensions': {
'device_type': 'marlin',
'os': 'Android',
},
},
},
'marshmallow': {
'swarming': {
'dimensions': {
......@@ -232,6 +380,13 @@
},
},
},
'marshmallow_generic': {
'swarming': {
'dimensions': {
'device_os': 'M',
},
},
},
'no_gpu': {
'swarming': {
'dimensions': {
......@@ -239,6 +394,13 @@
},
},
},
'nougat': {
'swarming': {
'dimensions': {
'device_os': 'N',
},
},
},
'nvidia_750m_mac_edition': {
'swarming': {
'dimensions': {
......@@ -246,6 +408,38 @@
},
},
},
'oreo': {
'swarming': {
'dimensions': {
'device_os': 'O',
},
},
},
'pie': {
'swarming': {
'dimensions': {
'device_os': 'P',
},
},
},
'shamu': {
# Nexus 6
'swarming': {
'dimensions': {
'device_type': 'shamu',
'os': 'Android',
},
},
},
'walleye': {
# Pixel 2
'swarming': {
'dimensions': {
'device_type': 'walleye',
'os': 'Android',
},
},
},
'win10': {
'swarming': {
'dimensions': {
......@@ -253,6 +447,44 @@
},
},
},
'win10_intel_hd_630_experimental': {
# Currently same as stable version.
'swarming': {
'dimensions': {
'gpu': '8086:5912-24.20.100.6286',
'os': 'Windows-10',
'pool': 'Chrome-GPU',
},
},
},
'win10_intel_hd_630_stable': {
'swarming': {
'dimensions': {
'gpu': '8086:5912-24.20.100.6286',
'os': 'Windows-10',
'pool': 'Chrome-GPU',
},
},
},
'win10_nvidia_quadro_p400_experimental': {
# Currently same as stable driver.
'swarming': {
'dimensions': {
'gpu': '10de:1cb3-23.21.13.8816',
'os': 'Windows-10',
'pool': 'Chrome-GPU',
},
},
},
'win10_nvidia_quadro_p400_stable': {
'swarming': {
'dimensions': {
'gpu': '10de:1cb3-23.21.13.8816',
'os': 'Windows-10',
'pool': 'Chrome-GPU',
},
},
},
'win7': {
'swarming': {
'dimensions': {
......@@ -260,6 +492,24 @@
},
},
},
'win7_amd_r7_240': {
'swarming': {
'dimensions': {
'gpu': '1002:6613',
'os': 'Windows-2008ServerR2-SP1',
'pool': 'Chrome-GPU',
},
},
},
'win7_nvidia_quadro_p400': {
'swarming': {
'dimensions': {
'gpu': '10de:1cb3-23.21.13.8792',
'os': 'Windows-2008ServerR2-SP1',
'pool': 'Chrome-GPU',
},
},
},
'win8': {
'swarming': {
'dimensions': {
......
testing/buildbot/waterfalls.pyl
View file @ 73c3bd8b
......@@ -1611,15 +1611,10 @@
'browser_config': 'android-chromium',
'os_type': 'android',
'skip_merge_script': True,
'swarming': {
'dimension_sets': [
{
'device_os': 'MMB29Q',
'device_type': 'bullhead',
'os': 'Android',
},
],
},
'mixins': [
'marshmallow',
'bullhead',
],
'test_suites': {
'gpu_telemetry_tests': 'gpu_common_telemetry_tests',
},
......@@ -1633,16 +1628,9 @@
'Linux Debug (NVIDIA)': {
'browser_config': 'debug',
'os_type': 'linux',
'swarming': {
'dimension_sets': [
{
# LINUX_QUADRO_P400_STABLE_DRIVER
'gpu': '10de:1cb3-384.90',
'os': 'Ubuntu',
'pool': 'Chrome-GPU',
},
],
},
'mixins': [
'linux_nvidia_quadro_p400',
],
'test_suites': {
'gtest_tests': 'gpu_desktop_gtests',
'gpu_telemetry_tests': 'gpu_common_win_and_linux_telemetry_tests',
......@@ -1651,16 +1639,9 @@
'Linux Release (NVIDIA)': {
'browser_config': 'release',
'os_type': 'linux',
'swarming': {
'dimension_sets': [
{
# LINUX_QUADRO_P400_STABLE_DRIVER
'gpu': '10de:1cb3-384.90',
'os': 'Ubuntu',
'pool': 'Chrome-GPU',
},
],
},
'mixins': [
'linux_nvidia_quadro_p400',
],
'test_suites': {
'gtest_tests': 'gpu_desktop_gtests',
'gpu_telemetry_tests': 'gpu_common_win_and_linux_telemetry_tests',
......@@ -1669,14 +1650,9 @@
'Mac Debug (Intel)': {
'browser_config': 'debug',
'os_type': 'mac',
'swarming': {
'dimension_sets': [
{
'gpu': '8086:0a2e',
'os': 'Mac-10.12.6',
},
],
},
'mixins': [
'mac_mini_intel_gpu',
],
'test_suites': {
'gtest_tests': 'gpu_desktop_gtests',
'gpu_telemetry_tests': 'gpu_common_telemetry_tests',
......@@ -1685,14 +1661,9 @@
'Mac Release (Intel)': {
'browser_config': 'release',
'os_type': 'mac',
'swarming': {
'dimension_sets': [
{
'gpu': '8086:0a2e',
'os': 'Mac-10.12.6',
},
],
},
'mixins': [
'mac_mini_intel_gpu',
],
'test_suites': {
'gtest_tests': 'gpu_desktop_gtests',
'gpu_telemetry_tests': 'gpu_common_telemetry_tests',
......@@ -1701,16 +1672,9 @@
'Mac Retina Debug (AMD)': {
'browser_config': 'debug',
'os_type': 'mac',
'swarming': {
'dimension_sets': [
{
'gpu': '1002:6821',
'hidpi': '1',
'os': 'Mac-10.13.6',
'pool': 'Chrome-GPU',
},
],
},
'mixins': [
'mac_retina_amd_gpu',
],
'test_suites': {
'gtest_tests': 'gpu_desktop_gtests',
'gpu_telemetry_tests': 'gpu_common_telemetry_tests',
......@@ -1719,16 +1683,9 @@
'Mac Retina Release (AMD)': {
'browser_config': 'release',
'os_type': 'mac',
'swarming': {
'dimension_sets': [
{
'gpu': '1002:6821',
'hidpi': '1',
'os': 'Mac-10.13.6',
'pool': 'Chrome-GPU',
},
],
},
'mixins': [
'mac_retina_amd_gpu',
],
'test_suites': {
'gtest_tests': 'gpu_desktop_gtests',
'gpu_telemetry_tests': 'gpu_common_telemetry_tests',
......@@ -1737,17 +1694,9 @@
'Win10 Debug (NVIDIA)': {
'browser_config': 'debug',
'os_type': 'win',
'swarming': {
'dimension_sets': [
{
# WIN10_NVIDIA_QUADRO_P400_STABLE_DRIVER
'gpu': '10de:1cb3-23.21.13.8816',
# WIN10_NVIDIA_QUADRO_P400_STABLE_OS
'os': 'Windows-10',
'pool': 'Chrome-GPU',
},
],
},
'mixins': [
'win10_nvidia_quadro_p400_stable',
],
'test_suites': {
'gtest_tests': 'gpu_win_gtests',
'gpu_telemetry_tests': 'gpu_common_win_and_linux_telemetry_tests',
......@@ -1756,17 +1705,9 @@
'Win10 Release (NVIDIA)': {
'browser_config': 'release',
'os_type': 'win',
'swarming': {
'dimension_sets': [
{
# WIN10_NVIDIA_QUADRO_P400_STABLE_DRIVER
'gpu': '10de:1cb3-23.21.13.8816',
# WIN10_NVIDIA_QUADRO_P400_STABLE_OS
'os': 'Windows-10',
'pool': 'Chrome-GPU',
},
],
},
'mixins': [
'win10_nvidia_quadro_p400_stable',
],
'test_suites': {
'gtest_tests': 'gpu_win_gtests',
'gpu_telemetry_tests': 'gpu_common_win_and_linux_telemetry_tests',
......@@ -1781,16 +1722,11 @@
'Android FYI 32 Vk Release (Nexus 5X)': {
'os_type': 'android',
'skip_merge_script': True,
'swarming': {
'dimension_sets': [
{
'device_type': 'bullhead',
'device_os': 'O',
'os': 'Android',
'pool': 'Chrome-GPU',
},
],
},
'mixins': [
'bullhead',
'gpu_pool',
'oreo',
],
'test_suites': {
'gtest_tests': 'gpu_angle_gtests',
'isolated_scripts': 'gpu_fyi_and_optional_isolated_scripts',
......@@ -1799,16 +1735,11 @@
'Android FYI 32 Vk Release (Pixel 2)': {
'os_type': 'android',
'skip_merge_script': True,
'swarming': {
'dimension_sets': [
{
'device_type': 'walleye',
'device_os': 'P',
'os': 'Android',
'pool': 'Chrome-GPU',
},
],
},
'mixins': [
'gpu_pool',
'pie',
'walleye',
],
'test_suites': {
'gtest_tests': 'gpu_angle_gtests',
'isolated_scripts': 'gpu_fyi_and_optional_isolated_scripts',
......@@ -1817,16 +1748,11 @@
'Android FYI 32 Vk Release (Pixel XL)': {
'os_type': 'android',
'skip_merge_script': True,
'swarming': {
'dimension_sets': [
{
'device_type': 'marlin',
'device_os': 'P',
'os': 'Android',
'pool': 'Chrome-GPU',
},
],
},
'mixins': [
'gpu_pool',
'marlin',
'pie',
],
'test_suites': {
'gtest_tests': 'gpu_angle_gtests',
'isolated_scripts': 'gpu_fyi_and_optional_isolated_scripts',
......@@ -1835,16 +1761,11 @@
'Android FYI 32 dEQP Vk Release (Nexus 5X)': {
'os_type': 'android',
'skip_merge_script': True,
'swarming': {
'dimension_sets': [
{
'device_type': 'bullhead',
'device_os': 'O',
'os': 'Android',
'pool': 'Chrome-GPU',
},
],
},
'mixins': [
'bullhead',
'gpu_pool',
'oreo',
],
'test_suites': {
'gtest_tests': 'gpu_angle_deqp_gles2_vulkan_tests',
},
......@@ -1852,16 +1773,11 @@
'Android FYI 32 dEQP Vk Release (Pixel 2)': {
'os_type': 'android',
'skip_merge_script': True,
'swarming': {
'dimension_sets': [
{
'device_type': 'walleye',
'device_os': 'P',
'os': 'Android',
'pool': 'Chrome-GPU',
},
],
},
'mixins': [
'gpu_pool',
'pie',
'walleye',
],
'test_suites': {
'gtest_tests': 'gpu_angle_deqp_gles2_vulkan_tests',
},
......@@ -1869,16 +1785,11 @@
'Android FYI 32 dEQP Vk Release (Pixel XL)': {
'os_type': 'android',
'skip_merge_script': True,
'swarming': {
'dimension_sets': [
{
'device_type': 'marlin',
'device_os': 'P',
'os': 'Android',
'pool': 'Chrome-GPU',
},
],
},
'mixins': [
'gpu_pool',
'marlin',
'pie',
],
'test_suites': {
'gtest_tests': 'gpu_angle_deqp_gles2_vulkan_tests',
},
......@@ -1886,16 +1797,11 @@
'Android FYI 64 Vk Release (Nexus 5X)': {
'os_type': 'android',
'skip_merge_script': True,
'swarming': {
'dimension_sets': [
{
'device_type': 'bullhead',
'device_os': 'O',
'os': 'Android',
'pool': 'Chrome-GPU',
},
],
},
'mixins': [
'bullhead',
'gpu_pool',
'oreo',
],
'test_suites': {
'gtest_tests': 'gpu_angle_gtests',
'isolated_scripts': 'gpu_fyi_and_optional_isolated_scripts',
......@@ -1904,16 +1810,11 @@
'Android FYI 64 Vk Release (Pixel 2)': {
'os_type': 'android',
'skip_merge_script': True,
'swarming': {
'dimension_sets': [
{
'device_type': 'walleye',
'device_os': 'P',
'os': 'Android',
'pool': 'Chrome-GPU',
},
],
},
'mixins': [
'gpu_pool',
'pie',
'walleye',
],
'test_suites': {
'gtest_tests': 'gpu_angle_gtests',
'isolated_scripts': 'gpu_fyi_and_optional_isolated_scripts',
......@@ -1922,16 +1823,11 @@
'Android FYI 64 Vk Release (Pixel XL)': {
'os_type': 'android',
'skip_merge_script': True,
'swarming': {
'dimension_sets': [
{
'device_type': 'marlin',
'device_os': 'P',
'os': 'Android',
'pool': 'Chrome-GPU',
},
],
},
'mixins': [
'gpu_pool',
'marlin',
'pie',
],
'test_suites': {
'gtest_tests': 'gpu_angle_gtests',
'isolated_scripts': 'gpu_fyi_and_optional_isolated_scripts',
......@@ -1940,16 +1836,11 @@
'Android FYI 64 dEQP Vk Release (Nexus 5X)': {
'os_type': 'android',
'skip_merge_script': True,
'swarming': {
'dimension_sets': [
{
'device_type': 'bullhead',
'device_os': 'O',
'os': 'Android',
'pool': 'Chrome-GPU',
},
],
},
'mixins': [
'bullhead',
'gpu_pool',
'oreo',
],
'test_suites': {
'gtest_tests': 'gpu_angle_deqp_gles2_vulkan_tests',
},
......@@ -1957,16 +1848,11 @@
'Android FYI 64 dEQP Vk Release (Pixel 2)': {
'os_type': 'android',
'skip_merge_script': True,
'swarming': {
'dimension_sets': [
{
'device_type': 'walleye',
'device_os': 'P',
'os': 'Android',
'pool': 'Chrome-GPU',
},
],
},
'mixins': [
'gpu_pool',
'pie',
'walleye',
],
'test_suites': {
'gtest_tests': 'gpu_angle_deqp_gles2_vulkan_tests',
},
......@@ -1974,16 +1860,11 @@
'Android FYI 64 dEQP Vk Release (Pixel XL)': {
'os_type': 'android',
'skip_merge_script': True,
'swarming': {
'dimension_sets': [
{
'device_type': 'marlin',
'device_os': 'P',
'os': 'Android',
'pool': 'Chrome-GPU',
},
],
},
'mixins': [
'gpu_pool',
'marlin',
'pie',
],
'test_suites': {
'gtest_tests': 'gpu_angle_deqp_gles2_vulkan_tests',
},
......@@ -1992,16 +1873,11 @@
'browser_config': 'android-chromium',
'os_type': 'android',
'skip_merge_script': True,
'swarming': {
'dimension_sets': [
{
'device_type': 'foster',
'device_os': 'N',
'os': 'Android',
'pool': 'Chrome-GPU',
},
],
},
'mixins': [
'foster',
'gpu_pool',
'nougat',
],
'test_suites': {
'gtest_tests': 'gpu_fyi_android_and_mac_gtests',
'isolated_scripts': 'gpu_fyi_and_optional_isolated_scripts',
......@@ -2012,16 +1888,11 @@
'browser_config': 'android-chromium',
'os_type': 'android',
'skip_merge_script': True,
'swarming': {
'dimension_sets': [
{
'device_type': 'hammerhead',
'device_os': 'L',
'os': 'Android',
'pool': 'Chrome-GPU',
},
],
},
'mixins': [
'gpu_pool',
'hammerhead',
'lollipop',
],
'test_suites': {
'gtest_tests': 'gpu_fyi_android_and_mac_gtests',
'isolated_scripts': 'gpu_fyi_and_optional_isolated_scripts',
......@@ -2032,15 +1903,10 @@
'browser_config': 'android-chromium',
'os_type': 'android',
'skip_merge_script': True,
'swarming': {
'dimension_sets': [
{
'device_type': 'bullhead',
'device_os': 'MMB29Q',
'os': 'Android'
},
],
},
'mixins': [
'marshmallow',
'bullhead',
],
'test_suites': {
'gtest_tests': 'gpu_fyi_android_and_mac_gtests',
'isolated_scripts': 'gpu_fyi_and_optional_isolated_scripts',
......@@ -2051,16 +1917,11 @@
'browser_config': 'android-chromium',
'os_type': 'android',
'skip_merge_script': True,
'swarming': {
'dimension_sets': [
{
'device_type': 'shamu',
'device_os': 'L',
'os': 'Android',
'pool': 'Chrome-GPU',
},
],
},
'mixins': [
'gpu_pool',
'lollipop',
'shamu',
],
'test_suites': {
'gtest_tests': 'gpu_fyi_android_and_mac_gtests',
'isolated_scripts': 'gpu_fyi_and_optional_isolated_scripts',
......@@ -2071,16 +1932,11 @@
'browser_config': 'android-chromium',
'os_type': 'android',
'skip_merge_script': True,
'swarming': {
'dimension_sets': [
{
'device_type': 'angler',
'device_os': 'M',
'os': 'Android',
'pool': 'Chrome-GPU',
},
],
},
'mixins': [
'angler',
'gpu_pool',
'marshmallow_generic',
],
'test_suites': {
'gtest_tests': 'gpu_fyi_android_and_mac_gtests',
'isolated_scripts': 'gpu_fyi_and_optional_isolated_scripts',
......@@ -2091,16 +1947,11 @@
'browser_config': 'android-chromium',
'os_type': 'android',
'skip_merge_script': True,
'swarming': {
'dimension_sets': [
{
'device_type': 'flounder',
'device_os': 'M',
'os': 'Android',
'pool': 'Chrome-GPU',
},
],
},
'mixins': [
'flounder',
'gpu_pool',
'marshmallow_generic',
],
'test_suites': {
'gtest_tests': 'gpu_fyi_android_and_mac_gtests',
'isolated_scripts': 'gpu_fyi_and_optional_isolated_scripts',
......@@ -2110,15 +1961,10 @@
'Android FYI dEQP Release (Nexus 5X)': {
'os_type': 'android',
'skip_merge_script': True,
'swarming': {
'dimension_sets': [
{
'device_type': 'bullhead',
'device_os': 'MMB29Q',
'os': 'Android'
},
],
},
'mixins': [
'marshmallow',
'bullhead',
],
'test_suites': {
'gtest_tests': 'gpu_angle_deqp_android_gtests',
},
......@@ -2139,16 +1985,9 @@
'Linux FYI Debug (NVIDIA)': {
'browser_config': 'debug',
'os_type': 'linux',
'swarming': {
'dimension_sets': [
{
# LINUX_QUADRO_P400_STABLE_DRIVER
'gpu': '10de:1cb3-384.90',
'os': 'Ubuntu',
'pool': 'Chrome-GPU',
},
],
},
'mixins': [
'linux_nvidia_quadro_p400',
],
'test_suites': {
'gtest_tests': 'gpu_fyi_linux_debug_gtests',
'gpu_telemetry_tests': 'gpu_fyi_win_and_linux_telemetry_tests',
......@@ -2158,16 +1997,9 @@
# This bot doesn't run any Telemetry-based tests so doesn't
# need the browser_config parameter.
'os_type': 'linux',
'swarming': {
'dimension_sets': [
{
# LINUX_QUADRO_P400_STABLE_DRIVER
'gpu': '10de:1cb3-384.90',
'os': 'Ubuntu',
'pool': 'Chrome-GPU',
},
],
},
'mixins': [
'linux_nvidia_quadro_p400',
],
'test_suites': {
# This bot doesn't run any browser-based tests
# (tab_capture_end2end_tests) either.
......@@ -2177,15 +2009,9 @@
},
'Linux FYI Ozone (Intel)': {
'os_type': 'linux',
'swarming': {
'dimension_sets': [
{
'gpu': '8086:1912',
'os': 'Ubuntu',
'pool': 'Chrome-GPU',
},
],
},
'mixins': [
'linux_intel_hd_530',
],
# This bot runs only a few tests so far.
'test_suites': {
'gtest_tests': 'gpu_angle_gtests',
......@@ -2194,20 +2020,14 @@
'Linux FYI Release (AMD R7 240)': {
'os_type': 'linux',
'browser_config': 'release',
'swarming': {
'dimension_sets': [
{
'gpu': '1002:6613',
'os': 'Ubuntu',
'pool': 'Chrome-GPU',
},
],
# There's only one bot of this type in the Swarming pool right now, so
# we have to increase the default expiration time of 1 hour (3600
# seconds) to prevent webgl2_conformance_tests' shards from timing
# out.
'expiration': 10800,
},
# There's only one bot of this type in the Swarming pool right now, so
# we have to increase the default expiration time of 1 hour (3600
# seconds) to prevent webgl2_conformance_tests' shards from timing
# out.
'mixins': [
'limited_capacity_bot',
'linux_amd_r7_240',
],
'test_suites': {
'gtest_tests': 'gpu_fyi_linux_release_gtests',
'gpu_telemetry_tests': 'gpu_fyi_win_and_linux_release_telemetry_tests',
......@@ -2216,16 +2036,9 @@
'Linux FYI Release (Intel HD 630)': {
'os_type': 'linux',
'browser_config': 'release',
'swarming': {
'dimension_sets': [
{
# INTEL_HD_630
'gpu': '8086:5912',
'os': 'Ubuntu',
'pool': 'Chrome-GPU',
},
],
},
'mixins': [
'linux_intel_hd_630',
],
'test_suites': {
'gtest_tests': 'gpu_fyi_linux_release_gtests',
'gpu_telemetry_tests': 'gpu_fyi_linux_intel_and_nvidia_release_telemetry_tests',
......@@ -2234,16 +2047,9 @@
'Linux FYI Release (NVIDIA)': {
'os_type': 'linux',
'browser_config': 'release',
'swarming': {
'dimension_sets': [
{
# LINUX_QUADRO_P400_STABLE_DRIVER
'gpu': '10de:1cb3-384.90',
'os': 'Ubuntu',
'pool': 'Chrome-GPU',
},
],
},
'mixins': [
'linux_nvidia_quadro_p400',
],
'test_suites': {
'gtest_tests': 'gpu_fyi_linux_release_gtests',
'isolated_scripts': 'gpu_fyi_and_optional_isolated_scripts',
......@@ -2253,16 +2059,9 @@
'Linux FYI dEQP Release (Intel HD 630)': {
'os_type': 'linux',
'browser_config': 'release',
'swarming': {
'dimension_sets': [
{
# INTEL_HD_630
'gpu': '8086:5912',
'os': 'Ubuntu',
'pool': 'Chrome-GPU',
},
],
},
'mixins': [
'linux_intel_hd_630',
],
'test_suites': {
'gtest_tests': 'gpu_angle_deqp_gles2_gl_tests',
},
......@@ -2270,16 +2069,9 @@
'Linux FYI dEQP Release (NVIDIA)': {
'os_type': 'linux',
'browser_config': 'release',
'swarming': {
'dimension_sets': [
{
# LINUX_QUADRO_P400_STABLE_DRIVER
'gpu': '10de:1cb3-384.90',
'os': 'Ubuntu',
'pool': 'Chrome-GPU',
},
],
},
'mixins': [
'linux_nvidia_quadro_p400',
],
'test_suites': {
'gtest_tests': 'gpu_angle_deqp_linux_nvidia_gtests',
},
......@@ -2329,14 +2121,9 @@
'Mac FYI Debug (Intel)': {
'os_type': 'mac',
'browser_config': 'debug',
'swarming': {
'dimension_sets': [
{
'gpu': '8086:0a2e',
'os': 'Mac-10.12.6',
},
],
},
'mixins': [
'mac_mini_intel_gpu',
],
'test_suites': {
'gtest_tests': 'gpu_fyi_mac_debug_gtests',
'gpu_telemetry_tests': 'gpu_common_telemetry_tests',
......@@ -2345,15 +2132,9 @@
'Mac FYI Experimental Release (Intel)': {
'os_type': 'mac',
'browser_config': 'release',
'swarming': {
'dimension_sets': [
{
'gpu': '8086:0a2e',
'os': 'Mac-10.13.6',
'pool': 'Chrome-GPU',
},
],
},
'mixins': [
'mac_mini_intel_gpu_experimental',
],
'test_suites': {
'gtest_tests': 'gpu_fyi_mac_release_gtests',
'gpu_telemetry_tests': 'gpu_fyi_mac_release_telemetry_tests',
......@@ -2362,16 +2143,9 @@
'Mac FYI Experimental Retina Release (AMD)': {
'os_type': 'mac',
'browser_config': 'release',
'swarming': {
'dimension_sets': [
{
'gpu': '1002:6821',
'hidpi': '1',
'os': 'Mac-10.13.6',
'pool': 'Chrome-GPU',
},
],
},
'mixins': [
'mac_retina_amd_gpu_experimental',
],
'test_suites': {
'gtest_tests': 'gpu_fyi_mac_release_gtests',
'gpu_telemetry_tests': 'gpu_fyi_mac_release_telemetry_tests',
......@@ -2380,21 +2154,10 @@
'Mac FYI Experimental Retina Release (NVIDIA)': {
'os_type': 'mac',
'browser_config': 'release',
'swarming': {
'dimension_sets': [
{
'gpu': '10de:0fe9',
'hidpi': '1',
'os': 'Mac-10.13.6',
'pool': 'Chrome-GPU',
},
],
# There's only one bot of this type in the Swarming pool right now, so
# we have to increase the default expiration time of 1 hour (3600
# seconds) to prevent webgl2_conformance_tests' shards from timing
# out. Definitely need over 3 hours, so choose 6.
'expiration': 21600,
},
'mixins': [
'limited_capacity_bot',
'mac_retina_nvidia_gpu_experimental',
],
'test_suites': {
'gtest_tests': 'gpu_fyi_mac_release_gtests',
'gpu_telemetry_tests': 'gpu_fyi_mac_release_telemetry_tests',
......@@ -2406,6 +2169,7 @@
'swarming': {
'dimension_sets': [
# This bot spawns jobs on multiple GPU types.
# TODO(kbr): figure out how to use mixins for these.
{
'gpu': '8086:0a2e',
'os': 'Mac-10.12.6',
......@@ -2426,14 +2190,9 @@
'Mac FYI Release (Intel)': {
'os_type': 'mac',
'browser_config': 'release',
'swarming': {
'dimension_sets': [
{
'gpu': '8086:0a2e',
'os': 'Mac-10.12.6',
},
],
},
'mixins': [
'mac_mini_intel_gpu',
],
'test_suites': {
'gtest_tests': 'gpu_fyi_mac_release_gtests',
'gpu_telemetry_tests': 'gpu_fyi_mac_release_telemetry_tests',
......@@ -2442,16 +2201,9 @@
'Mac FYI Retina Debug (AMD)': {
'os_type': 'mac',
'browser_config': 'debug',
'swarming': {
'dimension_sets': [
{
'gpu': '1002:6821',
'hidpi': '1',
'os': 'Mac-10.13.6',
'pool': 'Chrome-GPU',
},
],
},
'mixins': [
'mac_retina_amd_gpu',
],
'test_suites': {
'gtest_tests': 'gpu_fyi_mac_debug_gtests',
'gpu_telemetry_tests': 'gpu_common_telemetry_tests',
......@@ -2460,16 +2212,9 @@
'Mac FYI Retina Debug (NVIDIA)': {
'os_type': 'mac',
'browser_config': 'debug',
'swarming': {
'dimension_sets': [
{
'gpu': '10de:0fe9',
'hidpi': '1',
'os': 'Mac-10.13.6',
'pool': 'Chrome-GPU',
},
],
},
'mixins': [
'mac_retina_nvidia_gpu',
],
'test_suites': {
'gtest_tests': 'gpu_fyi_mac_debug_gtests',
'gpu_telemetry_tests': 'gpu_common_telemetry_tests',
......@@ -2478,16 +2223,9 @@
'Mac FYI Retina Release (AMD)': {
'os_type': 'mac',
'browser_config': 'release',
'swarming': {
'dimension_sets': [
{
'gpu': '1002:6821',
'hidpi': '1',
'os': 'Mac-10.13.6',
'pool': 'Chrome-GPU',
},
],
},
'mixins': [
'mac_retina_amd_gpu',
],
'test_suites': {
'gtest_tests': 'gpu_fyi_mac_release_gtests',
'gpu_telemetry_tests': 'gpu_fyi_mac_release_telemetry_tests',
......@@ -2496,16 +2234,9 @@
'Mac FYI Retina Release (NVIDIA)': {
'os_type': 'mac',
'browser_config': 'release',
'swarming': {
'dimension_sets': [
{
'gpu': '10de:0fe9',
'hidpi': '1',
'os': 'Mac-10.13.6',
'pool': 'Chrome-GPU',
},
],
},
'mixins': [
'mac_retina_nvidia_gpu',
],
'test_suites': {
'gtest_tests': 'gpu_fyi_mac_release_gtests',
'gpu_telemetry_tests': 'gpu_fyi_mac_release_telemetry_tests',
......@@ -2513,30 +2244,18 @@
},
'Mac FYI dEQP Release AMD': {
'os_type': 'mac',
'swarming': {
'dimension_sets': [
{
'gpu': '1002:6821',
'hidpi': '1',
'os': 'Mac-10.13.6',
'pool': 'Chrome-GPU',
},
],
},
'mixins': [
'mac_retina_amd_gpu',
],
'test_suites': {
'gtest_tests': 'gpu_angle_deqp_mac_gtests',
},
},
'Mac FYI dEQP Release Intel': {
'os_type': 'mac',
'swarming': {
'dimension_sets': [
{
'gpu': '8086:0a2e',
'os': 'Mac-10.12.6',
},
],
},
'mixins': [
'mac_mini_intel_gpu',
],
'test_suites': {
'gtest_tests': 'gpu_angle_deqp_mac_gtests',
},
......@@ -2544,36 +2263,25 @@
'Mac Pro FYI Release (AMD)': {
'os_type': 'mac',
'browser_config': 'release',
'swarming': {
'dimension_sets': [
{
'gpu': '1002:679e',
'os': 'Mac-10.12',
'pool': 'Chrome-GPU',
},
],
# There are only two bots of this type in the Swarming pool right now,
# so we have to increase the default expiration time of 1 hour (3600
# seconds) to prevent webgl2_conformance_tests' shards from timing
# out.
'expiration': 10800,
},
'test_suites': {
'gtest_tests': 'gpu_fyi_mac_release_gtests',
'gpu_telemetry_tests': 'gpu_fyi_mac_release_telemetry_tests',
},
},
'Optional Android Release (Nexus 5X)': {
'os_type': 'android',
'swarming': {
'dimension_sets': [
{
'device_type': 'bullhead',
'device_os': 'MMB29Q',
'os': 'Android'
},
],
# There are only two bots of this type in the Swarming pool right now,
# so we have to increase the default expiration time of 1 hour (3600
# seconds) to prevent webgl2_conformance_tests' shards from timing
# out.
'mixins': [
'limited_capacity_bot',
'mac_pro_amd_gpu',
],
'test_suites': {
'gtest_tests': 'gpu_fyi_mac_release_gtests',
'gpu_telemetry_tests': 'gpu_fyi_mac_release_telemetry_tests',
},
},
'Optional Android Release (Nexus 5X)': {
'os_type': 'android',
'mixins': [
'marshmallow',
'bullhead',
],
# No tests run on this bot right now; they are all running on the main
# android_n5x_swarming_rel bot. We should get the WebGL 2.0 conformance
# tests running on this bot, similarly to how they run on the optional
......@@ -2582,16 +2290,9 @@
'Optional Linux Release (Intel HD 630)': {
'os_type': 'linux',
'browser_config': 'release',
'swarming': {
'dimension_sets': [
{
# INTEL_HD_630
'gpu': '8086:5912',
'os': 'Ubuntu',
'pool': 'Chrome-GPU',
},
],
},
'mixins': [
'linux_intel_hd_630',
],
'test_suites': {
'gtest_tests': 'gpu_fyi_linux_optional_gtests',
'gpu_telemetry_tests': 'gpu_fyi_optional_linux_telemetry_tests',
......@@ -2600,16 +2301,9 @@
'Optional Linux Release (NVIDIA)': {
'os_type': 'linux',
'browser_config': 'release',
'swarming': {
'dimension_sets': [
{
# LINUX_QUADRO_P400_STABLE_DRIVER
'gpu': '10de:1cb3-384.90',
'os': 'Ubuntu',
'pool': 'Chrome-GPU',
},
],
},
'mixins': [
'linux_nvidia_quadro_p400',
],
'test_suites': {
'gtest_tests': 'gpu_fyi_linux_optional_gtests',
# This optional tryserver additionally runs angle_perftests.
......@@ -2620,14 +2314,9 @@
'Optional Mac Release (Intel)': {
'os_type': 'mac',
'browser_config': 'release',
'swarming': {
'dimension_sets': [
{
'gpu': '8086:0a2e',
'os': 'Mac-10.12.6',
},
],
},
'mixins': [
'mac_mini_intel_gpu',
],
'test_suites': {
'gtest_tests': 'gpu_fyi_mac_optional_gtests',
'gpu_telemetry_tests': 'gpu_fyi_optional_telemetry_tests',
......@@ -2636,16 +2325,9 @@
'Optional Mac Retina Release (AMD)': {
'os_type': 'mac',
'browser_config': 'release',
'swarming': {
'dimension_sets': [
{
'gpu': '1002:6821',
'hidpi': '1',
'os': 'Mac-10.13.6',
'pool': 'Chrome-GPU',
},
],
},
'mixins': [
'mac_retina_amd_gpu',
],
'test_suites': {
'gtest_tests': 'gpu_fyi_mac_optional_gtests',
'gpu_telemetry_tests': 'gpu_fyi_optional_telemetry_tests',
......@@ -2654,16 +2336,9 @@
'Optional Mac Retina Release (NVIDIA)': {
'os_type': 'mac',
'browser_config': 'release',
'swarming': {
'dimension_sets': [
{
'gpu': '10de:0fe9',
'hidpi': '1',
'os': 'Mac-10.13.6',
'pool': 'Chrome-GPU',
},
],
},
'mixins': [
'mac_retina_nvidia_gpu',
],
'test_suites': {
'gtest_tests': 'gpu_fyi_mac_optional_gtests',
'gpu_telemetry_tests': 'gpu_fyi_optional_telemetry_tests',
......@@ -2672,16 +2347,9 @@
'Optional Win10 Release (Intel HD 630)': {
'os_type': 'win',
'browser_config': 'release',
'swarming': {
'dimension_sets': [
{
# WIN10_INTEL_HD_630_STABLE_DRIVER
'gpu': '8086:5912-24.20.100.6286',
'os': 'Windows-10',
'pool': 'Chrome-GPU',
},
],
},
'mixins': [
'win10_intel_hd_630_stable',
],
'test_suites': {
'gtest_tests': 'gpu_fyi_win_optional_gtests',
'gpu_telemetry_tests': 'gpu_optional_win_telemetry_tests',
......@@ -2690,17 +2358,9 @@
'Optional Win10 Release (NVIDIA)': {
'os_type': 'win',
'browser_config': 'release',
'swarming': {
'dimension_sets': [
{
# WIN10_NVIDIA_QUADRO_P400_STABLE_DRIVER
'gpu': '10de:1cb3-23.21.13.8816',
# WIN10_NVIDIA_QUADRO_P400_STABLE_OS
'os': 'Windows-10',
'pool': 'Chrome-GPU',
},
],
},
'mixins': [
'win10_nvidia_quadro_p400_stable',
],
'test_suites': {
'gtest_tests': 'gpu_fyi_win_optional_gtests',
# This optional tryserver additionally runs angle_perftests.
......@@ -2712,17 +2372,9 @@
'Win10 FYI Debug (NVIDIA)': {
'os_type': 'win',
'browser_config': 'debug',
'swarming': {
'dimension_sets': [
{
# WIN10_NVIDIA_QUADRO_P400_STABLE_DRIVER
'gpu': '10de:1cb3-23.21.13.8816',
# WIN10_NVIDIA_QUADRO_P400_STABLE_OS
'os': 'Windows-10',
'pool': 'Chrome-GPU',
},
],
},
'mixins': [
'win10_nvidia_quadro_p400_stable',
],
'test_suites': {
'gtest_tests': 'gpu_fyi_win_gtests',
'gpu_telemetry_tests': 'gpu_fyi_win_debug_telemetry_tests',
......@@ -2731,16 +2383,9 @@
'Win10 FYI Exp Release (Intel HD 630)': {
'os_type': 'win',
'browser_config': 'release',
'swarming': {
'dimension_sets': [
{
# WIN10_INTEL_HD_630_EXPERIMENTAL_DRIVER
'gpu': '8086:5912-24.20.100.6286',
'os': 'Windows-10',
'pool': 'Chrome-GPU',
},
],
},
'mixins': [
'win10_intel_hd_630_experimental',
],
'test_suites': {
'gtest_tests': 'gpu_fyi_win_gtests',
'gpu_telemetry_tests': 'gpu_fyi_win_release_telemetry_tests',
......@@ -2751,17 +2396,9 @@
'Win10 FYI Exp Release (NVIDIA)': {
'os_type': 'win',
'browser_config': 'release',
'swarming': {
'dimension_sets': [
{
# WIN10_NVIDIA_QUADRO_P400_EXPERIMENTAL_DRIVER
'gpu': '10de:1cb3-23.21.13.8816',
# WIN10_NVIDIA_QUADRO_P400_EXPERIMENTAL_OS
'os': 'Windows-10',
'pool': 'Chrome-GPU',
},
],
},
'mixins': [
'win10_nvidia_quadro_p400_experimental',
],
# Currently the experimental driver is identical to the stable
# driver. If it's upgraded, change these test_suites to be the same as
# 'Win10 FYI Release (NVIDIA)'.
......@@ -2772,16 +2409,9 @@
'Win10 FYI Release (Intel HD 630)': {
'os_type': 'win',
'browser_config': 'release',
'swarming': {
'dimension_sets': [
{
# WIN10_INTEL_HD_630_STABLE_DRIVER
'gpu': '8086:5912-24.20.100.6286',
'os': 'Windows-10',
'pool': 'Chrome-GPU',
},
],
},
'mixins': [
'win10_intel_hd_630_stable',
],
'test_suites': {
'gtest_tests': 'gpu_fyi_win_gtests',
'gpu_telemetry_tests': 'gpu_fyi_win_release_telemetry_tests',
......@@ -2790,17 +2420,9 @@
'Win10 FYI Release (NVIDIA)': {
'os_type': 'win',
'browser_config': 'release',
'swarming': {
'dimension_sets': [
{
# WIN10_NVIDIA_QUADRO_P400_STABLE_DRIVER
'gpu': '10de:1cb3-23.21.13.8816',
# WIN10_NVIDIA_QUADRO_P400_STABLE_OS
'os': 'Windows-10',
'pool': 'Chrome-GPU',
},
],
},
'mixins': [
'win10_nvidia_quadro_p400_stable',
],
'test_suites': {
'gtest_tests': 'gpu_fyi_win_gtests',
'isolated_scripts': 'gpu_fyi_and_optional_win_isolated_scripts',
......@@ -2810,33 +2432,18 @@
},
'Win10 FYI dEQP Release (Intel HD 630)': {
'os_type': 'win',
'swarming': {
'dimension_sets': [
{
# WIN10_INTEL_HD_630_STABLE_DRIVER
'gpu': '8086:5912-24.20.100.6286',
'os': 'Windows-10',
'pool': 'Chrome-GPU',
},
],
},
'mixins': [
'win10_intel_hd_630_stable',
],
'test_suites': {
'gtest_tests': 'gpu_angle_deqp_gles2_d3d11_tests',
},
},
'Win10 FYI dEQP Release (NVIDIA)': {
'os_type': 'win',
'swarming': {
'dimension_sets': [
{
# WIN10_NVIDIA_QUADRO_P400_STABLE_DRIVER
'gpu': '10de:1cb3-23.21.13.8816',
# WIN10_NVIDIA_QUADRO_P400_STABLE_OS
'os': 'Windows-10',
'pool': 'Chrome-GPU',
},
],
},
'mixins': [
'win10_nvidia_quadro_p400_stable',
],
'test_suites': {
'gtest_tests': 'gpu_angle_deqp_win_nvidia_gtests',
},
......@@ -2848,15 +2455,9 @@
'Win7 ANGLE Tryserver (AMD)': {
'os_type': 'win',
'browser_config': 'release',
'swarming': {
'dimension_sets': [
{
'gpu': '1002:6613',
'os': 'Windows-2008ServerR2-SP1',
'pool': 'Chrome-GPU',
},
],
},
'mixins': [
'win7_amd_r7_240',
],
'test_suites': {
'gtest_tests': 'gpu_win_angle_amd_gtests',
'gpu_telemetry_tests': 'gpu_win_angle_amd_telemetry_tests',
......@@ -2865,15 +2466,9 @@
'Win7 FYI Debug (AMD)': {
'os_type': 'win',
'browser_config': 'debug',
'swarming': {
'dimension_sets': [
{
'gpu': '1002:6613',
'os': 'Windows-2008ServerR2-SP1',
'pool': 'Chrome-GPU',
},
],
},
'mixins': [
'win7_amd_r7_240',
],
'test_suites': {
'gtest_tests': 'gpu_fyi_win_gtests',
'gpu_telemetry_tests': 'gpu_fyi_win_debug_telemetry_tests',
......@@ -2882,15 +2477,9 @@
'Win7 FYI Release (AMD)': {
'os_type': 'win',
'browser_config': 'release',
'swarming': {
'dimension_sets': [
{
'gpu': '1002:6613',
'os': 'Windows-2008ServerR2-SP1',
'pool': 'Chrome-GPU',
},
],
},
'mixins': [
'win7_amd_r7_240',
],
'test_suites': {
'gtest_tests': 'gpu_fyi_win_gtests',
'gpu_telemetry_tests': 'gpu_fyi_win_amd_telemetry_tests',
......@@ -2899,17 +2488,9 @@
'Win7 FYI Release (NVIDIA)': {
'os_type': 'win',
'browser_config': 'release',
'swarming': {
'dimension_sets': [
{
# WIN7_NVIDIA_QUADRO_P400_STABLE_DRIVER
'gpu': '10de:1cb3-23.21.13.8792',
# WIN7_NVIDIA_QUADRO_P400_STABLE_OS
'os': 'Windows-2008ServerR2-SP1',
'pool': 'Chrome-GPU',
},
],
},
'mixins': [
'win7_nvidia_quadro_p400',
],
'test_suites': {
'gtest_tests': 'gpu_fyi_win7_gtests',
'gpu_telemetry_tests': 'gpu_fyi_win7_nvidia_release_telemetry_tests',
......@@ -2918,15 +2499,9 @@
},
'Win7 FYI dEQP Release (AMD)': {
'os_type': 'win',
'swarming': {
'dimension_sets': [
{
'gpu': '1002:6613',
'os': 'Windows-2008ServerR2-SP1',
'pool': 'Chrome-GPU',
},
],
},
'mixins': [
'win7_amd_r7_240',
],
'test_suites': {
'gtest_tests': 'gpu_angle_deqp_win_amd_gtests',
},
......@@ -2934,17 +2509,9 @@
'Win7 FYI x64 Release (NVIDIA)': {
'os_type': 'win',
'browser_config': 'release_x64',
'swarming': {
'dimension_sets': [
{
# WIN7_NVIDIA_QUADRO_P400_STABLE_DRIVER
'gpu': '10de:1cb3-23.21.13.8792',
# WIN7_NVIDIA_QUADRO_P400_STABLE_OS
'os': 'Windows-2008ServerR2-SP1',
'pool': 'Chrome-GPU',
},
],
},
'mixins': [
'win7_nvidia_quadro_p400',
],
'test_suites': {
'gtest_tests': 'gpu_fyi_win7_gtests',
'gpu_telemetry_tests': 'gpu_fyi_win7_nvidia_release_telemetry_tests',
......@@ -3773,15 +3340,10 @@
'browser_config': 'android-chromium',
'os_type': 'android',
'skip_merge_script': True,
'swarming': {
'dimension_sets': [
{
'device_os': 'MMB29Q',
'device_type': 'bullhead',
'os': 'Android',
},
],
},
'mixins': [
'bullhead',
'marshmallow',
],
'test_suites': {
'gpu_telemetry_tests': 'gpu_common_telemetry_tests',
},
......@@ -3789,16 +3351,9 @@
'Linux V8 FYI Release (NVIDIA)': {
'os_type': 'linux',
'browser_config': 'release',
'swarming': {
'dimension_sets': [
{
# LINUX_QUADRO_P400_STABLE_DRIVER
'gpu': '10de:1cb3-384.90',
'os': 'Ubuntu',
'pool': 'Chrome-GPU',
},
],
},
'mixins': [
'linux_nvidia_quadro_p400',
],
'test_suites': {
'gpu_telemetry_tests': 'gpu_v8_desktop_telemetry_tests',
},
......@@ -3806,16 +3361,9 @@
'Linux V8 FYI Release - concurrent marking (NVIDIA)': {
'os_type': 'linux',
'browser_config': 'release',
'swarming': {
'dimension_sets': [
{
# LINUX_QUADRO_P400_STABLE_DRIVER
'gpu': '10de:1cb3-384.90',
'os': 'Ubuntu',
'pool': 'Chrome-GPU',
},
],
},
'mixins': [
'linux_nvidia_quadro_p400',
],
'test_suites': {
'gpu_telemetry_tests': 'gpu_v8_desktop_telemetry_tests',
},
......@@ -3823,14 +3371,9 @@
'Mac V8 FYI Release (Intel)': {
'browser_config': 'release',
'os_type': 'mac',
'swarming': {
'dimension_sets': [
{
'gpu': '8086:0a2e',
'os': 'Mac-10.12.6',
},
],
},
'mixins': [
'mac_mini_intel_gpu',
],
'test_suites': {
'gpu_telemetry_tests': 'gpu_v8_desktop_telemetry_tests',
},
......@@ -3893,19 +3436,11 @@
'Win V8 FYI Release (NVIDIA)': {
'os_type': 'win',
'browser_config': 'release',
'swarming': {
'dimension_sets': [
{
# TODO(kbr): cut this bot over to Win10, coordinating with
# V8 team.
# WIN7_NVIDIA_QUADRO_P400_STABLE_DRIVER
'gpu': '10de:1cb3-23.21.13.8792',
# WIN7_NVIDIA_QUADRO_P400_STABLE_OS
'os': 'Windows-2008ServerR2-SP1',
'pool': 'Chrome-GPU',
},
],
},
'mixins': [
# TODO(kbr): cut this bot over to Win10, coordinating with
# V8 team.
'win7_nvidia_quadro_p400',
],
'test_suites': {
'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