generate_buildbot_json.py: Sort all .pyl files
This CL sorts all .pyl files which are inputs to the
//testing/buildbot/generate_buildbot_json.py script, and ensures that
future changes must keep those files sorted. It does this using python
ast parsing.
NOTRY=true
Change-Id: I6742aa9ef1c63d9c1e5143a2790886c0c763e588
Reviewed-on: https://chromium-review.googlesource.com/1232531
Commit-Queue: Stephen Martinis <[email protected]>
Reviewed-by: Kenneth Russell <[email protected]>
Cr-Commit-Position: refs/heads/master@{#593353}diff --git a/testing/buildbot/test_suite_exceptions.pyl b/testing/buildbot/test_suite_exceptions.pyl
index 9b36f85..3ade8a4 100644
--- a/testing/buildbot/test_suite_exceptions.pyl
+++ b/testing/buildbot/test_suite_exceptions.pyl
@@ -723,33 +723,6 @@
},
},
},
- 'single_process_mash_browser_tests': {
- 'remove_from': [
- # Temporarily remove from ASan/LSan bot due to flakiness. crbug.com/885309
- 'Linux Chromium OS ASan LSan Tests (1)',
- ],
- 'modifications': {
- # chromium.chromiumos
- 'linux-chromeos-dbg': {
- 'swarming': {
- 'shards': 20,
- },
- },
- # chromium.memory
- 'Linux Chromium OS ASan LSan Tests (1)': {
- # These are very slow on the ASAN trybot for some reason.
- # crbug.com/794372
- 'swarming': {
- 'shards': 30,
- },
- },
- 'Linux ChromiumOS MSan Tests': {
- 'swarming': {
- 'shards': 20,
- },
- },
- },
- },
'nacl_helper_nonsfi_unittests': {
'remove_from': [
# chromium.memory
@@ -962,6 +935,26 @@
'ToTWinThinLTO64',
],
},
+ 'performance_test_suite': {
+ 'modifications': {
+ 'Mac10.13 Tests (dbg)': {
+ 'args': [
+ '--browser=debug',
+ ],
+ },
+ 'Win10 Tests x64 (dbg)': {
+ 'args': [
+ '--browser=debug_x64',
+ ],
+ 'experiment_percentage': 100,
+ },
+ 'Win7 Tests (dbg)(1)': {
+ 'args': [
+ '--browser=debug',
+ ],
+ },
+ },
+ },
'remoting_unittests': {
'remove_from': [
# chromium.linux
@@ -980,6 +973,33 @@
'Linux MSan Tests', # https://crbug.com/831676
],
},
+ 'single_process_mash_browser_tests': {
+ 'remove_from': [
+ # Temporarily remove from ASan/LSan bot due to flakiness. crbug.com/885309
+ 'Linux Chromium OS ASan LSan Tests (1)',
+ ],
+ 'modifications': {
+ # chromium.chromiumos
+ 'linux-chromeos-dbg': {
+ 'swarming': {
+ 'shards': 20,
+ },
+ },
+ # chromium.memory
+ 'Linux Chromium OS ASan LSan Tests (1)': {
+ # These are very slow on the ASAN trybot for some reason.
+ # crbug.com/794372
+ 'swarming': {
+ 'shards': 30,
+ },
+ },
+ 'Linux ChromiumOS MSan Tests': {
+ 'swarming': {
+ 'shards': 20,
+ },
+ },
+ },
+ },
'site_per_process_webkit_layout_tests': {
'remove_from': [
# chromium.linux
@@ -1032,6 +1052,15 @@
},
},
},
+ 'swiftshader_unittests': {
+ 'remove_from': [
+ # Save capacity on the hardware where we have only a few machines.
+ 'Mac FYI Experimental Release (Intel)',
+ 'Mac FYI Experimental Retina Release (AMD)',
+ 'Mac FYI Experimental Retina Release (NVIDIA)',
+ 'Mac Pro FYI Release (AMD)',
+ ],
+ },
'sync_integration_tests': {
'modifications': {
'Win7 Tests (dbg)(1)': {
@@ -1048,35 +1077,6 @@
'Linux TSan Tests', # https://crbug.com/852002
],
},
- 'performance_test_suite': {
- 'modifications': {
- 'Mac10.13 Tests (dbg)': {
- 'args': [
- '--browser=debug',
- ],
- },
- 'Win10 Tests x64 (dbg)': {
- 'args': [
- '--browser=debug_x64',
- ],
- 'experiment_percentage': 100,
- },
- 'Win7 Tests (dbg)(1)': {
- 'args': [
- '--browser=debug',
- ],
- },
- },
- },
- 'swiftshader_unittests': {
- 'remove_from': [
- # Save capacity on the hardware where we have only a few machines.
- 'Mac FYI Experimental Release (Intel)',
- 'Mac FYI Experimental Retina Release (AMD)',
- 'Mac FYI Experimental Retina Release (NVIDIA)',
- 'Mac Pro FYI Release (AMD)',
- ],
- },
'tab_capture_end2end_tests': {
# Run these only on Release bots.
'remove_from': [
@@ -1090,13 +1090,6 @@
'Win7 FYI Debug (AMD)',
],
},
- 'telemetry_unittests': {
- 'modifications': {
- 'Win10 Tests x64 (dbg)': {
- 'experiment_percentage': 100, # crbug.com/870673
- }
- }
- },
'telemetry_perf_unittests': {
'modifications': {
# chromium.android
@@ -1201,6 +1194,13 @@
'Win10 Tests x64 (dbg)',
],
},
+ 'telemetry_unittests': {
+ 'modifications': {
+ 'Win10 Tests x64 (dbg)': {
+ 'experiment_percentage': 100, # crbug.com/870673
+ }
+ }
+ },
'unit_tests': {
'modifications': {
# chromium.clang
@@ -1253,24 +1253,6 @@
'Win10 FYI Exp Release (Intel HD 630)',
],
},
- 'viz_content_browsertests': {
- 'modifications': {
- # chromium.memory
- 'Linux Chromium OS ASan LSan Tests (1)': {
- # content_browsertests is slow on ASAN try bot. crbug.com/822461.
- 'swarming': {
- 'shards': 4,
- }
- },
- 'Linux ChromiumOS MSan Tests': {
- # These are very slow on the Chrome OS MSAN trybot for some reason.
- # crbug.com/865455
- 'swarming': {
- 'shards': 2,
- },
- },
- },
- },
'viz_browser_tests': {
'modifications': {
# chromium.chromiumos
@@ -1296,6 +1278,24 @@
},
},
},
+ 'viz_content_browsertests': {
+ 'modifications': {
+ # chromium.memory
+ 'Linux Chromium OS ASan LSan Tests (1)': {
+ # content_browsertests is slow on ASAN try bot. crbug.com/822461.
+ 'swarming': {
+ 'shards': 4,
+ }
+ },
+ 'Linux ChromiumOS MSan Tests': {
+ # These are very slow on the Chrome OS MSAN trybot for some reason.
+ # crbug.com/865455
+ 'swarming': {
+ 'shards': 2,
+ },
+ },
+ },
+ },
'viz_unittests': {
'remove_from': [
# chromium.win
@@ -1326,17 +1326,13 @@
'linux-chromeos-dbg', # https://crbug.com/859307
],
},
- 'webgl_conformance_tests': {
+ 'webgl2_conformance_tests': {
+ 'remove_from': [
+ # 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': {
- # On desktop platforms these don't take very long (~7 minutes),
- # but on Android they take ~30 minutes and we want to use more
- # shards than on desktop.
- # chromium.gpu
- 'Android Release (Nexus 5X)': {
- 'swarming': {
- 'shards': 6,
- },
- },
'Mac FYI GPU ASAN Release': {
'args': [
'--is-asan',
@@ -1353,13 +1349,17 @@
'Win7 FYI Release (AMD)',
],
},
- 'webgl2_conformance_tests': {
- 'remove_from': [
- # 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)',
- ],
+ 'webgl_conformance_tests': {
'modifications': {
+ # On desktop platforms these don't take very long (~7 minutes),
+ # but on Android they take ~30 minutes and we want to use more
+ # shards than on desktop.
+ # chromium.gpu
+ 'Android Release (Nexus 5X)': {
+ 'swarming': {
+ 'shards': 6,
+ },
+ },
'Mac FYI GPU ASAN Release': {
'args': [
'--is-asan',
