testing/buildbot: enable bot existence checking for fyi, android.fyi, lkgr waterfalls

Looks like these waterfalls now exist in luci-milo.cfg, so this is now possible.

- Remove no-longer-existing bots "Chromium Mac 10.11",
  "Chromium Mac 10.11 Force Mac Toolchain", "Chromium Win 10 GCE Tests"

- "Chromium Win 10 GCE Tests" was the only bot using chromium_win_fyi_gtests,
  so remove that too (since the bot didn't exist, it wasn't used previously
  either), which in return was the only user of chrome_cleaner_gtests, so
  remove that too.

- Fix case sensitivity misspellings: We're not consistent about if bots are
  called ASan (more common) or ASAN (less common, but present).

- While here, also remove some remaining references to PGO from mb_config.pyl.

Follow-up to https://chromium-review.googlesource.com/c/chromium/src/+/1061597

Bug: 843511,820422
Change-Id: I70518fdedfab23c807afdcd8bb335a9aeacf09dc
Reviewed-on: https://chromium-review.googlesource.com/1093159Reviewed-by: Kenneth Russell <kbr@chromium.org>
Commit-Queue: Nico Weber <thakis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#565711}

testing/buildbot/chromium.lkgr.json

@@ -6,27 +6,27 @@
       "chromium_builder_asan"
     ]
   },
-  "ASAN Debug (32-bit x86 with V8-ARM)": {
+  "ASAN Release": {
     "additional_compile_targets": [
       "chromium_builder_asan"
     ]
   },
-  "ASAN Release": {
+  "ASAN Release Media": {
     "additional_compile_targets": [
       "chromium_builder_asan"
     ]
   },
-  "ASAN Release (32-bit x86 with V8-ARM)": {
+  "ASan Debug (32-bit x86 with V8-ARM)": {
     "additional_compile_targets": [
       "chromium_builder_asan"
     ]
   },
-  "ASAN Release Media": {
+  "ASan Release (32-bit x86 with V8-ARM)": {
     "additional_compile_targets": [
       "chromium_builder_asan"
     ]
   },
-  "ASAN Release Media (32-bit x86 with V8-ARM)": {
+  "ASan Release Media (32-bit x86 with V8-ARM)": {
     "additional_compile_targets": [
       "chromium_builder_asan"
     ]
@@ -46,17 +46,17 @@
       "chromium_builder_asan"
     ]
   },
-  "Mac ASan Debug": {
+  "Mac ASAN Debug": {
     "additional_compile_targets": [
       "chromium_builder_asan"
     ]
   },
-  "Mac ASan Release": {
+  "Mac ASAN Release": {
     "additional_compile_targets": [
       "chromium_builder_asan"
     ]
   },
-  "Mac ASan Release Media": {
+  "Mac ASAN Release Media": {
     "additional_compile_targets": [
       "chromium_builder_asan"
     ]

testing/buildbot/generate_buildbot_json.py

@@ -784,6 +784,15 @@ class BBJSONGenerator(object):
       'Optional Win10 Release (Intel HD 630)',
       'Optional Win10 Release (NVIDIA)',
       'Win7 ANGLE Tryserver (AMD)',
+      # chromium.android.fyi
+      'Unswarmed N5 Tests Dummy Builder',
+      'Unswarmed N5X Tests Dummy Builder',
+      # chromium.fyi
+      'chromeos-amd64-generic-rel-vm-tests',
+      'Dummy WebKit Mac10.13',
+      'WebKit Linux layout_ng Dummy Builder',
+      'WebKit Linux root_layer_scrolls Dummy Builder',
+      'WebKit Linux slimming_paint_v2 Dummy Builder',
     ]
 
   def check_input_file_consistency(self):
@@ -798,9 +807,7 @@ class BBJSONGenerator(object):
         if bot_name in bots_that_dont_exist:
           continue  # pragma: no cover
         if bot_name not in bot_names:
-          if waterfall['name'] in ['chromium.android.fyi', 'chromium.fyi',
-                                   'chromium.lkgr', 'client.v8.chromium',
-                                   'client.v8.fyi']:
+          if waterfall['name'] in ['client.v8.chromium', 'client.v8.fyi']:
             # TODO(thakis): Remove this once these bots move to luci.
             continue  # pragma: no cover
           if waterfall['name'] in ['tryserver.webrtc']:

testing/buildbot/gn_isolate_map.pyl

@@ -287,10 +287,6 @@
     "label": "//chrome/test:chrome_app_unittests",
     "type": "console_test_launcher",
   },
-  "chrome_cleaner_unittests": {
-    "label": "//chrome/chrome_cleaner:chrome_cleaner_unittests",
-    "type": "console_test_launcher",
-  },
   "chrome_elf_import_unittests": {
     "label": "//chrome_elf:chrome_elf_import_unittests",
     "type": "raw",

testing/buildbot/test_suite_exceptions.pyl

@@ -70,8 +70,6 @@
     'remove_from': [
       # chromium.fyi
       'mac-views-rel',
-      'Chromium Mac 10.11',
-      'Chromium Mac 10.11 Force Mac Toolchain',
       'Chromium Mac 10.13',
       # chromium.gpu and chromium.gpu.fyi
       # On Android, these are already run on the main waterfall.
@@ -367,8 +365,6 @@
     'remove_from': [
       # chromium.fyi
       'mac-views-rel',
-      'Chromium Mac 10.11',
-      'Chromium Mac 10.11 Force Mac Toolchain',
       'Chromium Mac 10.13',
       'Out of Process Profiling Mac',
     ],
@@ -615,8 +611,6 @@
       'linux-chromeos-rel',
       # chromium.fyi
       'mac-views-rel',
-      'Chromium Mac 10.11',
-      'Chromium Mac 10.11 Force Mac Toolchain',
       'Chromium Mac 10.13',
       'Out of Process Profiling Linux',
       'Out of Process Profiling Mac',
@@ -883,7 +877,6 @@
   'content_shell_crash_test': {
     'remove_from': [
       # chromium.fyi
-      'Chromium Mac 10.11',
       'Chromium Mac 10.13',
       'Out of Process Profiling Mac',
       # On chromium.linux, unclear why these only run on "Linux Tests".
@@ -1066,8 +1059,6 @@
     'remove_from': [
       # chromium.clang
       'linux-win_cross-rel', # https://crbug.com/762167
-      # chromium.fyi
-      'Chromium Win 10 GCE Tests',
     ],
   },
   'cronet_test_instrumentation_apk': {
@@ -1096,8 +1087,6 @@
     'remove_from': [
       # chromium.fyi
       'mac-views-rel',
-      'Chromium Mac 10.11',
-      'Chromium Mac 10.11 Force Mac Toolchain',
       'Chromium Mac 10.13',
       'Out of Process Profiling Mac',
       # chromium.win
@@ -1143,7 +1132,6 @@
     'remove_from': [
       # chromium.fyi, unclear why these aren't run.
       'mac-views-rel',
-      'Chromium Mac 10.11 Force Mac Toolchain',
       # chromium.win
       'Win7 Tests (dbg)(1)',
     ],
@@ -1171,8 +1159,6 @@
     'remove_from': [
       # chromium.fyi
       'mac-views-rel',
-      'Chromium Mac 10.11',
-      'Chromium Mac 10.11 Force Mac Toolchain',
       'Chromium Mac 10.13',
       'Out of Process Profiling Linux',
       'Out of Process Profiling Mac',
@@ -1204,10 +1190,7 @@
       'ToTLinuxASan',  # https://crbug.com/831667
       # chromium.fyi
       'mac-views-rel',
-      'Chromium Mac 10.11',
-      'Chromium Mac 10.11 Force Mac Toolchain',
       'Chromium Mac 10.13',
-      'Chromium Win 10 GCE Tests',
       'Out of Process Profiling Linux',
       'Out of Process Profiling Mac',
       # On chromium.linux, unclear why these aren't run on Cast.
@@ -1426,8 +1409,6 @@
     'remove_from': [
       # chromium.fyi
       'mac-views-rel',
-      'Chromium Mac 10.11',
-      'Chromium Mac 10.11 Force Mac Toolchain',
       'Chromium Mac 10.13',
       'Out of Process Profiling Linux',
       'Out of Process Profiling Mac',
@@ -1485,8 +1466,6 @@
       # chromium.clang
       'ToTLinuxUBSanVptr',
       'UBSanVptr Linux',
-      # chromium.fyi
-      'Chromium Win 10 GCE Tests',
       # chromium.memory
       'Linux TSan Tests',
     ],
@@ -1664,8 +1643,6 @@
     'remove_from': [
       # chromium.fyi
       'mac-views-rel',
-      'Chromium Mac 10.11',
-      'Chromium Mac 10.11 Force Mac Toolchain',
       'Chromium Mac 10.13',
       'Out of Process Profiling Mac',
     ],
@@ -1704,8 +1681,6 @@
 
       # chromium.fyi
       'mac-views-rel',
-      'Chromium Mac 10.11',
-      'Chromium Mac 10.11 Force Mac Toolchain',
       'Chromium Mac 10.13',
       'Out of Process Profiling Mac',
 
@@ -1720,7 +1695,6 @@
   'metrics_python_tests': {
     'remove_from': [
       # chromium.fyi
-      'Chromium Mac 10.11',
       'Chromium Mac 10.13',
       'Out of Process Profiling Mac',
     ],
@@ -1766,8 +1740,6 @@
     'remove_from': [
       # chromium.fyi
       'mac-views-rel',
-      'Chromium Mac 10.11',
-      'Chromium Mac 10.11 Force Mac Toolchain',
       'Chromium Mac 10.13',
       'Out of Process Profiling Mac',
       # chromium.clang
@@ -1908,8 +1880,6 @@
       # chromium.chromiumos
       'linux-chromeos-dbg',
       'linux-chromeos-rel',
-      # chromium.fyi
-      'Chromium Win 10 GCE Tests',
       # chromium.linux
       'Cast Audio Linux',
       'Cast Linux',
@@ -1935,8 +1905,6 @@
       'Mac Pro FYI Release (AMD)',
       # chromium.fyi
       'mac-views-rel',
-      'Chromium Mac 10.11',
-      'Chromium Mac 10.11 Force Mac Toolchain',
       'Chromium Mac 10.13',
       'Win 10 Fast Ring',
       # On chromium.linux, unclear why these aren't run on Cast.
@@ -2079,8 +2047,6 @@
       'linux-chromeos-rel',
       # chromium.fyi
       'mac-views-rel',
-      'Chromium Mac 10.11',
-      'Chromium Mac 10.11 Force Mac Toolchain',
       'Chromium Mac 10.13',
       'Out of Process Profiling Mac',
       # On chromium.win, unclear why these aren't run.
@@ -2530,7 +2496,6 @@
   'viz_unittests': {
     'remove_from': [
       # chromium.fyi
-      'Chromium Win 10 GCE Tests',
       'Out of Process Profiling Android',
       'Out of Process Profiling Linux',
       # chromium.win
@@ -2561,8 +2526,6 @@
   },
   'vr_common_unittests': {
     'remove_from': [
-      # chromium.fyi
-      'Chromium Win 10 GCE Tests',
       'Out of Process Profiling Android',
       # chromium.win
       'Win 7 Tests x64 (1)',
@@ -2606,7 +2569,6 @@
   'vr_pixeltests': {
     'remove_from': [
       # chromium.fyi
-      'Chromium Win 10 GCE Tests',
       'Out of Process Profiling Android',
       'VR Linux',
       # chromium.win
@@ -2672,7 +2634,6 @@
   'webkit_layout_tests': {
     'remove_from': [
       # chromium.fyi
-      'Chromium Mac 10.11',
       'Out of Process Profiling Mac',
       # chromium.linux
       'Linux Tests (dbg)(1)',
@@ -3044,8 +3005,6 @@
   },
   'zucchini_unittests': {
     'remove_from': [
-      # chromium.fyi
-      'Chromium Win 10 GCE Tests',
       # chromium.win
       'Win10 Tests x64',
     ],

testing/buildbot/test_suites.pyl

@@ -337,10 +337,6 @@
     },
   },
 
-  'chrome_cleaner_gtests': {
-    'chrome_cleaner_unittests': {}
-  },
-
   'chromedriver_py_tests_isolated_scripts': {
     'chromedriver_py_tests': {
       "args": [
@@ -2542,21 +2538,6 @@
     'vr_platform_specific_chromium_gtests',
   ],
 
-  'chromium_win_fyi_gtests': [
-    'aura_gtests',
-    'chrome_cleaner_gtests',
-    'chromium_gtests',
-    'chromium_gtests_for_devices_with_graphical_output',
-    'non_android_chromium_gtests',
-    'non_android_and_cast_and_chromeos_chromium_gtests',
-    'non_android_and_cast_and_chromeos_and_clang_and_mac_fyi_chromium_gtests',
-    'non_linux_chromium_gtests',
-    'non_mac_chromium_gtests',
-    'viz_gtests',
-    'vr_platform_specific_chromium_gtests',
-    'win_specific_chromium_gtests',
-  ],
-
   'chromium_win_gtests': [
     'aura_gtests',
     'chromium_gtests',

testing/buildbot/waterfalls.pyl

@@ -2050,30 +2050,12 @@
           'gtest_tests': 'chromium_linux_and_gl_gtests',
         },
       },
-      'Chromium Mac 10.11': {
-        'test_suites': {
-          'gtest_tests': 'chromium_mac_fyi_gtests',
-          'isolated_scripts': 'chromium_rel_isolated_scripts',
-        },
-        'use_swarming': False,
-      },
-      'Chromium Mac 10.11 Force Mac Toolchain': {
-        'test_suites': {
-          'gtest_tests': 'chromium_mac_fyi_gtests',
-        },
-        'use_swarming': False,
-      },
       'Chromium Mac 10.13': {
         'test_suites': {
           'gtest_tests': 'chromium_mac_fyi_gtests',
           'isolated_scripts': 'chromium_rel_isolated_scripts',
         },
       },
-      'Chromium Win 10 GCE Tests': {
-        'test_suites': {
-          'gtest_tests': 'chromium_win_fyi_gtests',
-        },
-      },
       'chromeos-amd64-generic-rel-goma-canary': {
         'additional_compile_targets': [
           'chromiumos_preflight',
@@ -2669,7 +2651,7 @@
           'chromium_builder_asan',
         ],
       },
-      'ASAN Debug (32-bit x86 with V8-ARM)': {
+      'ASan Debug (32-bit x86 with V8-ARM)': {
         'additional_compile_targets': [
           'chromium_builder_asan',
         ],
@@ -2679,7 +2661,7 @@
           'chromium_builder_asan',
         ],
       },
-      'ASAN Release (32-bit x86 with V8-ARM)': {
+      'ASan Release (32-bit x86 with V8-ARM)': {
         'additional_compile_targets': [
           'chromium_builder_asan',
         ],
@@ -2689,7 +2671,7 @@
           'chromium_builder_asan',
         ],
       },
-      'ASAN Release Media (32-bit x86 with V8-ARM)': {
+      'ASan Release Media (32-bit x86 with V8-ARM)': {
         'additional_compile_targets': [
           'chromium_builder_asan',
         ],
@@ -2699,17 +2681,17 @@
           'chromium_builder_asan',
         ],
       },
-      'Mac ASan Debug': {
+      'Mac ASAN Debug': {
         'additional_compile_targets': [
           'chromium_builder_asan',
         ],
       },
-      'Mac ASan Release': {
+      'Mac ASAN Release': {
         'additional_compile_targets': [
           'chromium_builder_asan',
         ],
       },
-      'Mac ASan Release Media': {
+      'Mac ASAN Release Media': {
         'additional_compile_targets': [
           'chromium_builder_asan',
         ],

tools/mb/mb_config.pyl

@@ -168,8 +168,6 @@
       'Linux x64 Goma Canary LocalOutputCache': 'release_bot',
 
       'mac-views-rel': 'mac_views_browser_release_bot',
-      'Chromium Mac 10.11': 'release_bot',
-      'Chromium Mac 10.11 Force Mac Toolchain': 'release_bot_mac_new_sdk',
       'Chromium Mac 10.13': 'release_bot',
 
       'Mac Builder Goma Canary': 'gpu_tests_release_bot',
@@ -178,15 +176,6 @@
       'Mac Builder (dbg) Goma Canary (clobber)': 'debug_bot',
       'Mac Goma Canary LocalOutputCache': 'release_bot_mac_strip',
 
-      'Chromium Win 10 GCE Tests': 'release_bot_minimal_symbols',
-      'Chromium Win PGO Builder': {
-        '1': 'official_optimize_chrome_pgo_phase_1_x86',
-        '2': 'official_optimize_chrome_pgo_phase_2_x86',
-      },
-      'Chromium Win x64 PGO Builder': {
-        '1': 'official_optimize_chrome_pgo_phase_1',
-        '2': 'official_optimize_chrome_pgo_phase_2',
-      },
       'Chromium Windows Analyze': 'windows_analyze',
 
       'Win7 Builder Goma Canary': 'release_bot_x86_minimal_symbols',
@@ -704,14 +693,6 @@
       'win_nacl_sdk': 'release_bot_x86_minimal_symbols',
       'win_nacl_sdk_build': 'release_bot_x86_minimal_symbols',
       'win_optional_gpu_tests_rel': 'gpu_fyi_tests_release_trybot_x86',
-      'win_pgo': {
-        '1': 'official_optimize_chrome_pgo_phase_1_x86',
-        '2': 'official_optimize_chrome_pgo_phase_2_x86',
-      },
-      'win_pgo_x64': {
-        '1': 'official_optimize_chrome_pgo_phase_1',
-        '2': 'official_optimize_chrome_pgo_phase_2',
-      },
       'win_upload_clang': 'release_bot',
       'win_chrome_official': 'official_goma_x86',
     },
@@ -1450,22 +1431,6 @@
       'official', 'goma', 'x86',
     ],
 
-    'official_optimize_chrome_pgo_phase_1': [
-      'official_optimize', 'chrome_pgo_phase_1',
-    ],
-
-    'official_optimize_chrome_pgo_phase_1_x86': [
-      'official_optimize', 'chrome_pgo_phase_1', 'x86',
-    ],
-
-    'official_optimize_chrome_pgo_phase_2': [
-      'official_optimize', 'chrome_pgo_phase_2',
-    ],
-
-    'official_optimize_chrome_pgo_phase_2_x86': [
-      'official_optimize', 'chrome_pgo_phase_2', 'x86',
-    ],
-
     'ozone_linux_release_bot': [
       'ozone_linux', 'release_bot',
     ],
@@ -1519,10 +1484,6 @@
       'release_bot', 'fuchsia', 'arm64', 'cast', 'cast_audio', 'no_symbols',
     ],
 
-    'release_bot_mac_new_sdk': [
-      'release_bot', 'mac_new_sdk',
-    ],
-
     'release_bot_mac_strip': [
       'release_bot', 'mac_strip',
     ],
@@ -1756,14 +1717,6 @@
       'gn_args': 'use_cfi_recover=true',
     },
 
-    'chrome_pgo_phase_1': {
-      'gn_args': 'chrome_pgo_phase=1 is_clang=false',
-    },
-
-    'chrome_pgo_phase_2': {
-      'gn_args': 'chrome_pgo_phase=2 is_clang=false',
-    },
-
     'chrome_with_codecs': {
       'mixins': ['ffmpeg_branding_chrome', 'proprietary_codecs'],
     },
@@ -1917,10 +1870,6 @@
       'mixins': ['chrome_with_codecs'],
     },
 
-    'mac_new_sdk': {
-      'gn_args': 'mac_sdk_min="10.12"',
-    },
-
     'headless': {
       'args_file': '//build/args/headless.gn',
     },