Remove testing specs for since-removed virtual GPU builders
All these bots were virtual builders, meaning they didn't exist. Their configs were present only to enable real trybot mirrors. But those trybot mirrors were all migrated to standalone trybots with their own testing specs. Meaning these testing specs for their virtual builders are no longer necessary. This also removes the testing spec for "Optional Android Release (Nexus 5X)", whose trybot was turned-down a while ago (unrelated to src-side migrations). Bug: 1317286, 1317188, 1317134, 1317105 Change-Id: Ia9fb500082b8b9b14a5b7d7000279167c30f165f Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3645379 Reviewed-by: Garrett Beaty <gbeaty@google.com> Reviewed-by: Brian Sheedy <bsheedy@chromium.org> Commit-Queue: Ben Pastene <bpastene@chromium.org> Cr-Commit-Position: refs/heads/main@{#1004870}
This commit is contained in:

committed by
Chromium LUCI CQ

parent
9fcd6ec415
commit
564fa57f10
File diff suppressed because it is too large
Load Diff
@ -1593,19 +1593,10 @@ class BBJSONGenerator(object): # pylint: disable=useless-object-inheritance
|
||||
return bot_names
|
||||
|
||||
def get_builders_that_do_not_actually_exist(self):
|
||||
# Some of the bots on the chromium.gpu.fyi waterfall in particular
|
||||
# Some of the bots on the chromium.fyi waterfall in particular
|
||||
# are defined only to be mirrored into trybots, and don't actually
|
||||
# exist on any of the waterfalls or consoles.
|
||||
return [
|
||||
'Optional Android Release (Nexus 5X)',
|
||||
'Optional Android Release (Pixel 4)',
|
||||
'Optional Linux Release (Intel HD 630)',
|
||||
'Optional Linux Release (NVIDIA)',
|
||||
'Optional Mac Release (Intel)',
|
||||
'Optional Mac Retina Release (AMD)',
|
||||
'Optional Mac Retina Release (NVIDIA)',
|
||||
'Optional Win10 x64 Release (Intel HD 630)',
|
||||
'Optional Win10 x64 Release (NVIDIA)',
|
||||
# chromium.fyi
|
||||
'linux-blink-optional-highdpi-rel-dummy',
|
||||
'mac10.12-blink-rel-dummy',
|
||||
|
@ -2103,12 +2103,6 @@
|
||||
'--extra-browser-args=--disable-wcg-for-test',
|
||||
],
|
||||
},
|
||||
'Optional Android Release (Pixel 4)': {
|
||||
'args': [
|
||||
# See above.
|
||||
'--extra-browser-args=--disable-wcg-for-test',
|
||||
],
|
||||
},
|
||||
'android_optional_gpu_tests_rel': {
|
||||
'args': [
|
||||
# See above.
|
||||
@ -2153,12 +2147,6 @@
|
||||
'--extra-browser-args=--disable-wcg-for-test',
|
||||
],
|
||||
},
|
||||
'Optional Android Release (Pixel 4)': {
|
||||
'args': [
|
||||
# See above.
|
||||
'--extra-browser-args=--disable-wcg-for-test',
|
||||
],
|
||||
},
|
||||
'android_optional_gpu_tests_rel': {
|
||||
'args': [
|
||||
# See above.
|
||||
@ -2606,12 +2594,6 @@
|
||||
'quickrun_shards': 2,
|
||||
},
|
||||
},
|
||||
'Optional Android Release (Pixel 4)': {
|
||||
'args': [
|
||||
# See above.
|
||||
'--extra-browser-args=--disable-wcg-for-test',
|
||||
],
|
||||
},
|
||||
'Win10 x64 Release (NVIDIA)': {
|
||||
'swarming': {
|
||||
'quickrun_shards': 2,
|
||||
@ -2661,12 +2643,6 @@
|
||||
'--extra-browser-args=--disable-wcg-for-test',
|
||||
],
|
||||
},
|
||||
'Optional Android Release (Pixel 4)': {
|
||||
'args': [
|
||||
# See above.
|
||||
'--extra-browser-args=--disable-wcg-for-test',
|
||||
],
|
||||
},
|
||||
'android_optional_gpu_tests_rel': {
|
||||
'args': [
|
||||
# See above.
|
||||
@ -2772,12 +2748,6 @@
|
||||
'--extra-browser-args=--disable-wcg-for-test',
|
||||
],
|
||||
},
|
||||
'Optional Android Release (Pixel 4)': {
|
||||
'args': [
|
||||
# See above.
|
||||
'--extra-browser-args=--disable-wcg-for-test',
|
||||
],
|
||||
},
|
||||
'android_optional_gpu_tests_rel': {
|
||||
'args': [
|
||||
# See above.
|
||||
@ -2798,12 +2768,6 @@
|
||||
'--extra-browser-args=--disable-wcg-for-test',
|
||||
],
|
||||
},
|
||||
'Optional Android Release (Pixel 4)': {
|
||||
'args': [
|
||||
# See above.
|
||||
'--extra-browser-args=--disable-wcg-for-test',
|
||||
],
|
||||
},
|
||||
'android_optional_gpu_tests_rel': {
|
||||
'args': [
|
||||
# See above.
|
||||
@ -3216,7 +3180,6 @@
|
||||
'video_decode_accelerator_gl_unittest': {
|
||||
'remove_from': [
|
||||
# Windows Intel doesn't have the GL extensions to support this test.
|
||||
'Optional Win10 x64 Release (Intel HD 630)',
|
||||
'Win10 FYI x64 Release (Intel HD 630)',
|
||||
'Win10 FYI x64 Exp Release (Intel HD 630)',
|
||||
],
|
||||
@ -3340,8 +3303,6 @@
|
||||
# Not enough capacity. https://crbug.com/982294
|
||||
'Mac Pro FYI Release (AMD)',
|
||||
'Mac FYI Retina Release (NVIDIA)',
|
||||
# Only run validating on Mac Intel due to capacity http://crbug.com/1236796
|
||||
'Optional Mac Release (Intel)',
|
||||
],
|
||||
},
|
||||
'webgl2_conformance_gl_passthrough_tests 8086:3e9b': {
|
||||
@ -3418,9 +3379,6 @@
|
||||
# Passthrough version run on this configuration, not enough capacity for
|
||||
# both. See https://crbug.com/1238070.
|
||||
'ChromeOS FYI Release (kevin)',
|
||||
# The Mac NVIDIA Retina bots don't have the capacity to run
|
||||
# this test suite on mac_optional_gpu_tests_rel.
|
||||
'Optional Mac Retina Release (NVIDIA)',
|
||||
],
|
||||
'modifications': {
|
||||
# This VM configuration is known to be significantly slower than other
|
||||
|
@ -6506,12 +6506,6 @@
|
||||
# 'gpu_webgl_conformance_validating_telemetry_tests',
|
||||
],
|
||||
|
||||
'gpu_fyi_mac_optional_gtests': [
|
||||
'gpu_fyi_and_optional_non_linux_gtests',
|
||||
'gpu_fyi_mac_specific_gtests',
|
||||
'gpu_gles2_conform_gtests',
|
||||
],
|
||||
|
||||
'gpu_fyi_mac_pro_release_telemetry_tests': [
|
||||
'gpu_common_and_optional_telemetry_tests',
|
||||
'gpu_passthrough_telemetry_tests',
|
||||
@ -6546,38 +6540,6 @@
|
||||
'gpu_webgl_conformance_swangle_passthrough_representative_telemetry_tests',
|
||||
],
|
||||
|
||||
'gpu_fyi_optional_mac_passthrough_telemetry_tests': [
|
||||
'gpu_common_and_optional_telemetry_tests',
|
||||
'gpu_mediapipe_passthrough_telemetry_tests',
|
||||
'gpu_passthrough_telemetry_tests',
|
||||
'gpu_webcodecs_telemetry_test',
|
||||
'gpu_webgl2_conformance_gl_passthrough_telemetry_tests',
|
||||
'gpu_webgl_conformance_gl_passthrough_telemetry_tests',
|
||||
'gpu_webgl_conformance_metal_passthrough_telemetry_tests',
|
||||
'gpu_webgl_conformance_swangle_passthrough_representative_telemetry_tests',
|
||||
],
|
||||
|
||||
'gpu_fyi_optional_mac_telemetry_tests': [
|
||||
'gpu_common_and_optional_telemetry_tests',
|
||||
'gpu_mediapipe_passthrough_telemetry_tests',
|
||||
'gpu_mediapipe_validating_telemetry_tests',
|
||||
'gpu_passthrough_telemetry_tests',
|
||||
'gpu_webcodecs_telemetry_test',
|
||||
'gpu_webgl2_conformance_gl_passthrough_telemetry_tests',
|
||||
'gpu_webgl2_conformance_validating_telemetry_tests',
|
||||
'gpu_webgl_conformance_gl_passthrough_telemetry_tests',
|
||||
'gpu_webgl_conformance_metal_passthrough_telemetry_tests',
|
||||
'gpu_webgl_conformance_swangle_passthrough_representative_telemetry_tests',
|
||||
],
|
||||
|
||||
'gpu_fyi_optional_telemetry_tests': [
|
||||
'gpu_common_and_optional_telemetry_tests',
|
||||
'gpu_mediapipe_passthrough_telemetry_tests',
|
||||
'gpu_mediapipe_validating_telemetry_tests',
|
||||
'gpu_webcodecs_telemetry_test',
|
||||
'gpu_webgl2_conformance_validating_telemetry_tests',
|
||||
],
|
||||
|
||||
'gpu_fyi_win_amd_release_telemetry_tests': [
|
||||
'gpu_common_and_optional_telemetry_tests',
|
||||
'gpu_mediapipe_passthrough_telemetry_tests',
|
||||
@ -6626,17 +6588,6 @@
|
||||
'rendering_desktop_representative_perf_tests_isolated_scripts',
|
||||
],
|
||||
|
||||
'gpu_fyi_win_optional_gtests': [
|
||||
'gpu_default_and_optional_win_specific_gtests',
|
||||
'gpu_fyi_and_optional_non_linux_gtests',
|
||||
'gpu_fyi_and_optional_win_specific_gtests',
|
||||
'gpu_gles2_conform_gtests',
|
||||
],
|
||||
|
||||
'gpu_fyi_win_optional_isolated_scripts': [
|
||||
'gpu_command_buffer_perf_passthrough_isolated_scripts',
|
||||
],
|
||||
|
||||
'gpu_fyi_win_release_telemetry_tests': [
|
||||
'gpu_common_and_optional_telemetry_tests',
|
||||
'gpu_passthrough_telemetry_tests',
|
||||
@ -6668,29 +6619,6 @@
|
||||
'gpu_webgl_conformance_validating_telemetry_tests',
|
||||
],
|
||||
|
||||
'gpu_optional_win_intel_telemetry_tests': [
|
||||
'gpu_common_and_optional_telemetry_tests',
|
||||
'gpu_mediapipe_passthrough_telemetry_tests',
|
||||
'gpu_webcodecs_telemetry_test',
|
||||
'gpu_webgl2_conformance_d3d11_passthrough_telemetry_tests',
|
||||
'gpu_webgl_conformance_d3d11_passthrough_telemetry_tests',
|
||||
'gpu_webgl_conformance_d3d9_passthrough_telemetry_tests',
|
||||
'gpu_webgl_conformance_gl_passthrough_telemetry_tests',
|
||||
'gpu_webgl_conformance_vulkan_passthrough_telemetry_tests',
|
||||
'gpu_win_intel_specific_telemetry_tests',
|
||||
],
|
||||
|
||||
'gpu_optional_win_telemetry_tests': [
|
||||
'gpu_common_and_optional_telemetry_tests',
|
||||
'gpu_mediapipe_passthrough_telemetry_tests',
|
||||
'gpu_webcodecs_telemetry_test',
|
||||
'gpu_webgl2_conformance_d3d11_passthrough_telemetry_tests',
|
||||
'gpu_webgl_conformance_d3d11_passthrough_telemetry_tests',
|
||||
'gpu_webgl_conformance_d3d9_passthrough_telemetry_tests',
|
||||
'gpu_webgl_conformance_gl_passthrough_telemetry_tests',
|
||||
'gpu_webgl_conformance_vulkan_passthrough_telemetry_tests',
|
||||
],
|
||||
|
||||
'gpu_pixel_4_and_6_telemetry_tests': [
|
||||
'gpu_common_and_optional_telemetry_tests',
|
||||
'gpu_mediapipe_passthrough_telemetry_tests',
|
||||
|
@ -4697,93 +4697,6 @@
|
||||
'gpu_telemetry_tests': 'gpu_fyi_mac_pro_release_telemetry_tests',
|
||||
},
|
||||
},
|
||||
# BEGIN Fake builder used as mirror targets for Optional GPU tryservers
|
||||
'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
|
||||
# desktop trybots.
|
||||
},
|
||||
'Optional Android Release (Pixel 4)': {
|
||||
'browser_config': 'android-chromium',
|
||||
'os_type': 'android',
|
||||
'skip_merge_script': True,
|
||||
'mixins': [
|
||||
'android_r',
|
||||
'has_native_resultdb_integration',
|
||||
'flame',
|
||||
'gpu-swarming-pool',
|
||||
],
|
||||
'test_suites': {
|
||||
'gpu_telemetry_tests': 'gpu_pixel_4_and_6_telemetry_tests',
|
||||
'android_webview_gpu_telemetry_tests': 'android_webview_gpu_telemetry_tests',
|
||||
},
|
||||
},
|
||||
'Optional Mac Release (Intel)': {
|
||||
'os_type': 'mac',
|
||||
'browser_config': 'release',
|
||||
'mixins': [
|
||||
'mac_mini_intel_gpu_stable',
|
||||
],
|
||||
'test_suites': {
|
||||
'gtest_tests': 'gpu_fyi_mac_optional_gtests',
|
||||
'gpu_telemetry_tests': 'gpu_fyi_optional_mac_telemetry_tests',
|
||||
},
|
||||
},
|
||||
'Optional Mac Retina Release (AMD)': {
|
||||
'os_type': 'mac',
|
||||
'browser_config': 'release',
|
||||
'mixins': [
|
||||
'mac_retina_amd_gpu_stable',
|
||||
],
|
||||
'test_suites': {
|
||||
'gtest_tests': 'gpu_fyi_mac_optional_gtests',
|
||||
'gpu_telemetry_tests': 'gpu_fyi_optional_mac_passthrough_telemetry_tests',
|
||||
},
|
||||
},
|
||||
'Optional Mac Retina Release (NVIDIA)': {
|
||||
'os_type': 'mac',
|
||||
'browser_config': 'release',
|
||||
'mixins': [
|
||||
'mac_retina_nvidia_gpu_stable',
|
||||
],
|
||||
'test_suites': {
|
||||
'gtest_tests': 'gpu_fyi_mac_optional_gtests',
|
||||
# Not currently running passthrough WebGL tests on this
|
||||
# configuration due to concerns about machine capacity.
|
||||
'gpu_telemetry_tests': 'gpu_fyi_optional_telemetry_tests',
|
||||
},
|
||||
},
|
||||
'Optional Win10 x64 Release (Intel HD 630)': {
|
||||
'os_type': 'win',
|
||||
'browser_config': 'release_x64',
|
||||
'mixins': [
|
||||
'swarming_containment_auto',
|
||||
'win10_intel_hd_630_stable',
|
||||
],
|
||||
'test_suites': {
|
||||
'gtest_tests': 'gpu_fyi_win_optional_gtests',
|
||||
'gpu_telemetry_tests': 'gpu_optional_win_intel_telemetry_tests',
|
||||
},
|
||||
},
|
||||
'Optional Win10 x64 Release (NVIDIA)': {
|
||||
'os_type': 'win',
|
||||
'browser_config': 'release_x64',
|
||||
'mixins': [
|
||||
'win10_nvidia_gtx_1660_stable',
|
||||
],
|
||||
'test_suites': {
|
||||
'gtest_tests': 'gpu_fyi_win_optional_gtests',
|
||||
'isolated_scripts': 'gpu_fyi_win_optional_isolated_scripts',
|
||||
'gpu_telemetry_tests': 'gpu_optional_win_telemetry_tests',
|
||||
},
|
||||
},
|
||||
# END Fake builder used as mirror targets for Optional GPU tryservers
|
||||
'Win10 FYI x64 DX12 Vulkan Debug (NVIDIA)': {
|
||||
'os_type': 'win',
|
||||
'browser_config': 'debug_x64',
|
||||
|
Reference in New Issue
Block a user