mb_config.pyl - add in placeholders for all of the missing builders.

This adds in 'tbd' entries for every builder that exists currently
on a buildbot master but didn't have entries in the config file; with
this change, we can now see all of the builders that still need to
be triaged and converted to GN.

R=estaab@chromium.org
BUG=481692

Review URL: https://codereview.chromium.org/1814073002

Cr-Commit-Position: refs/heads/master@{#382118}

1 files changed, 537 insertions, 100 deletions

diff --git a/tools/mb/mb_config.pyl b/tools/mb/mb_config.pyl
index 78c8cf6..6f4455e 100644
--- a/tools/mb/mb_config.pyl
+++ b/tools/mb/mb_config.pyl
@@ -6,8 +6,6 @@
   # This is a map of buildbot master names -> buildbot builder names ->
   # config names (where each config name is a key in the 'configs' dict,
   # below). MB uses this dict to look up which config to use for a given bot.
-  #
-  # TODO(crbug.com/481692): Add in remaining bots on the waterfalls.
   'masters': {
     # Take care when changing any of these builders to ensure that you do not
     # include a configuration with 'chrome_with_codecs' since these builders
@@ -20,7 +18,21 @@
       'Mac': 'noswarming_gyp_release_bot_mac_strip',
       'Win': 'noswarming_gyp_release_bot',
     },
+
     'chromium.android': {
+      'Android Cronet ARM64 Builder': 'tbd',
+      'Android Cronet ARM64 Builder (dbg)': 'tbd',
+      'Android Cronet ARMv6 Builder': 'tbd',
+      'Android Cronet Builder': 'tbd',
+      'Android Cronet Builder (dbg)': 'tbd',
+      'Android Cronet Data Reduction Proxy Builder': 'tbd',
+      'Android Cronet MIPS Builder': 'tbd',
+      'Android Cronet x86 Builder': 'tbd',
+      'Android Cronet x86 Builder (dbg)': 'tbd',
+      'Android WebView CTS L-MR1 (dbg)': 'tbd',
+      'Android Webview L (dbg)': 'tbd',
+      'Android Webview M (dbg)': 'tbd',
+
       'Android GN Builder (dbg)': 'android_gn_debug_bot',
       'Android MIPS Builder (dbg)': 'android_gn_debug_static_bot_mipsel',
       'Android Swarm Builder':
@@ -38,6 +50,7 @@
       'Marshmallow 64 bit Tester': 'android_gn_debug_static_bot_arm64',
       'Marshmallow Tablet Tester': 'android_gn_debug_static_bot',
     },
+
     'chromium.chrome': {
       'Google Chrome ChromeOS': 'gyp_official_goma_chromeos',
       'Google Chrome Linux x64': 'gn_official_goma',
@@ -45,10 +58,214 @@
       'Google Chrome Mac': 'gyp_official_goma',
       'Google Chrome Win': 'gyp_official_goma_minimal_symbols_x86',
     },
+
     'chromium.chromiumos': {
+      'ChromiumOS amd64-generic Compile': 'tbd',
+      'ChromiumOS daisy Compile': 'tbd',
+      'ChromiumOS x86-generic Compile': 'tbd',
+      'Linux ChromiumOS Builder': 'tbd',
+      'Linux ChromiumOS Builder (dbg)': 'tbd',
+      'Linux ChromiumOS Full': 'tbd',
+      'Linux ChromiumOS Ozone Builder': 'tbd',
+      'Linux ChromiumOS Ozone Tests (1)': 'tbd',
+      'Linux ChromiumOS Tests (1)': 'tbd',
+      'Linux ChromiumOS Tests (dbg)(1)': 'tbd',
+
       'Linux ChromiumOS GN (dbg)': 'chromeos_gn_debug_bot',
       'Linux ChromiumOS GN': 'chromeos_ozone_gn_release_bot',
     },
+
+    'chromium.fyi': {
+      'Android Asan Builder Tests (dbg)': 'tbd',
+      'Android Builder (dbg)': 'tbd',
+      'Android ChromeDriver Tests (dbg)': 'tbd',
+      'Android Cloud Tests': 'tbd',
+      'Android Remoting Tests': 'tbd',
+      'Android Tests (trial)(dbg)': 'tbd',
+      'Android Tests (x86 emulator)': 'tbd',
+      'Blink Linux LSan ASan': 'tbd',
+      'Browser Side Navigation Linux': 'tbd',
+      'Chromium Builder': 'tbd',
+      'Chromium Builder (dbg)': 'tbd',
+      'Chromium Linux Buildrunner': 'tbd',
+      'Chromium Linux Goma Canary': 'tbd',
+      'Chromium Linux Goma Canary (clobber)': 'tbd',
+      'Chromium Linux Precise Goma LinkTest': 'tbd',
+      'Chromium Linux32 Goma Canary (clobber)': 'tbd',
+      'Chromium Mac 10.10 MacViews': 'tbd',
+      'Chromium Mac 10.11': 'tbd',
+      'Chromium Mac 10.9 Goma Canary': 'tbd',
+      'Chromium Mac 10.9 Goma Canary (clobber)': 'tbd',
+      'Chromium Mac 10.9 Goma Canary (dbg)': 'tbd',
+      'Chromium Mac 10.9 Goma Canary (dbg)(clobber)': 'tbd',
+      'Chromium Win 10': 'tbd',
+      'Chromium Win MiniInstaller Tests': 'tbd',
+      'Chromium Win PGO Builder': 'tbd',
+      'Chromium Win x64 Clobber': 'tbd',
+      'Chromium Win x64 PGO Builder': 'tbd',
+      'Chromium Windows Analyze': 'tbd',
+      'Chromium Windows Buildrunner': 'tbd',
+      'Chromium Windows Instant Extended': 'tbd',
+      'ChromiumOS Linux Tests': 'tbd',
+      'Chromium_iOS_Device': 'tbd',
+      'Chromium_iOS_Device_(ninja)': 'tbd',
+      'Chromium_iOS_Simulator_(dbg)': 'tbd',
+      'ClangToTAndroidASan': 'tbd',
+      'ClangToTAndroidASan tester': 'tbd',
+      'ClangToTLinux': 'tbd',
+      'ClangToTLinux (dbg)': 'tbd',
+      'ClangToTLinux tester': 'tbd',
+      'ClangToTLinuxASan': 'tbd',
+      'ClangToTLinuxASan tester': 'tbd',
+      'ClangToTLinuxUBSanVptr': 'tbd',
+      'ClangToTLinuxUBSanVptr tester': 'tbd',
+      'ClangToTMac': 'tbd',
+      'ClangToTMac (dbg)': 'tbd',
+      'ClangToTMac tester': 'tbd',
+      'ClangToTMacASan': 'tbd',
+      'ClangToTMacASan tester': 'tbd',
+      'ClangToTWin': 'tbd',
+      'ClangToTWin tester': 'tbd',
+      'ClangToTWin(dbg)': 'tbd',
+      'ClangToTWin(dbg) tester': 'tbd',
+      'ClangToTWin(dll)': 'tbd',
+      'ClangToTWin(dll) tester': 'tbd',
+      'ClangToTWin64': 'tbd',
+      'ClangToTWin64 tester': 'tbd',
+      'ClangToTWin64(dbg)': 'tbd',
+      'ClangToTWin64(dbg) tester': 'tbd',
+      'ClangToTWin64(dll)': 'tbd',
+      'ClangToTWin64(dll) tester': 'tbd',
+      'ClangToTiOS': 'tbd',
+      'Closure Compilation Linux': 'tbd',
+      'CrWin7Goma': 'tbd',
+      'CrWin7Goma(clbr)': 'tbd',
+      'CrWin7Goma(dbg)': 'tbd',
+      'CrWin7Goma(dll)': 'tbd',
+      'CrWinAsan': 'tbd',
+      'CrWinAsan tester': 'tbd',
+      'CrWinAsan(dll)': 'tbd',
+      'CrWinAsan(dll) tester': 'tbd',
+      'CrWinAsanCov': 'tbd',
+      'CrWinAsanCov tester': 'tbd',
+      'CrWinClang': 'tbd',
+      'CrWinClang tester': 'tbd',
+      'CrWinClang(dbg)': 'tbd',
+      'CrWinClang(dbg) tester': 'tbd',
+      'CrWinClang(shared)': 'tbd',
+      'CrWinClang(shared) tester': 'tbd',
+      'CrWinClang64': 'tbd',
+      'CrWinClang64 tester': 'tbd',
+      'CrWinClang64(dbg) tester': 'tbd',
+      'CrWinClang64(dll)': 'tbd',
+      'CrWinClang64(dll) tester': 'tbd',
+      'CrWinClangGoma': 'tbd',
+      'CrWinClangLLD': 'tbd',
+      'CrWinClangLLD tester': 'tbd',
+      'CrWinClangLLD64': 'tbd',
+      'CrWinClangLLD64 tester': 'tbd',
+      'CrWinClngLLD64dbg': 'tbd',
+      'CrWinClngLLD64dbg tester': 'tbd',
+      'CrWinClngLLDdbg': 'tbd',
+      'CrWinClngLLDdbg tester': 'tbd',
+      'CrWinGoma': 'tbd',
+      'CrWinGoma(dll)': 'tbd',
+      'Linux Trusty': 'tbd',
+      'Linux Trusty (32)': 'tbd',
+      'Linux Trusty (dbg)': 'tbd',
+      'Linux Trusty (dbg)(32)': 'tbd',
+      'Linux V8 API Stability': 'tbd',
+      'MD Top Chrome ChromeOS material-hybrid': 'tbd',
+      'MD Top Chrome ChromeOS non-material': 'tbd',
+      'MD Top Chrome Linux material': 'tbd',
+      'MD Top Chrome Win material': 'tbd',
+      'Ozone ECS Linux': 'tbd',
+      'Vista Tests (dbg)(1)': 'tbd',
+      'Vista Tests (dbg)(2)': 'tbd',
+      'Win8 Tests (1)': 'tbd',
+      'Win8 Tests (2)': 'tbd',
+      'Windows 8 App Certification': 'tbd',
+      'Windows Browser (DrMemory light) (1)': 'tbd',
+      'Windows Browser (DrMemory light) (2)': 'tbd',
+      'Windows Builder (DrMemory)': 'tbd',
+      'Windows Tests (DrMemory)': 'tbd',
+
+      'CFI Linux CF': 'gn_cfi_diag_release_bot',
+      'CFI Linux ToT': 'gn_cfi_release_bot',
+      'CFI Linux': 'gn_cfi_release_bot',
+      'CrWinClang64(dbg)': 'win_clang_debug_bot',
+      'Libfuzzer Upload Linux ASan': 'gn_release_libfuzzer_asan',
+      'Libfuzzer Upload Linux MSan': 'gn_release_libfuzzer_msan',
+      'Linux ARM': 'swarming_gyp_release_bot_arm',
+      'Site Isolation Linux': 'gn_release_trybot',
+      'Site Isolation Win': 'gyp_release_trybot_x64',
+      'Win LKGR (DrM 64)': 'gn_release_drmemory_drfuzz',
+      'Win LKGR (DrM)': 'gn_release_drmemory_drfuzz_x86',
+    },
+
+    'chromium.gpu': {
+      'Android Debug (Nexus 5)': 'tbd',
+      'Android Debug (Nexus 6)': 'tbd',
+      'Android Debug (Nexus 9)': 'tbd',
+      'GPU Mac Builder': 'tbd',
+      'GPU Mac Builder (dbg)': 'tbd',
+      'GPU Win Builder': 'tbd',
+      'GPU Win Builder (dbg)': 'tbd',
+      'Mac 10.10 Debug (Intel)': 'tbd',
+      'Mac 10.10 Release (Intel)': 'tbd',
+      'Mac 10.10 Retina Debug (AMD)': 'tbd',
+      'Mac 10.10 Retina Release (AMD)': 'tbd',
+      'Mac Retina Debug': 'tbd',
+      'Mac Retina Release': 'tbd',
+      'Win7 Debug (NVIDIA)': 'tbd',
+      'Win7 Release (ATI)': 'tbd',
+      'Win7 Release (NVIDIA)': 'tbd',
+
+      'GPU Linux Builder (dbg)': 'swarming_gpu_tests_gn_debug_bot',
+      'GPU Linux Builder': 'swarming_gpu_tests_gn_release_bot',
+      'Linux Debug (NVIDIA)': 'none',
+      'Linux Release (NVIDIA)': 'none',
+    },
+
+    'chromium.gpu.fyi': {
+      'GPU Mac Builder': 'tbd',
+      'GPU Mac Builder (dbg)': 'tbd',
+      'GPU Win Builder': 'tbd',
+      'GPU Win Builder (dbg)': 'tbd',
+      'GPU Win Clang Builder (dbg)': 'tbd',
+      'GPU Win x64 Builder': 'tbd',
+      'GPU Win x64 Builder (dbg)': 'tbd',
+      'Linux Audio': 'tbd',
+      'Linux Release (NVIDIA GeForce 730)': 'tbd',
+      'Mac 10.10 Debug (ATI)': 'tbd',
+      'Mac 10.10 Debug (Intel)': 'tbd',
+      'Mac 10.10 Release (ATI)': 'tbd',
+      'Mac 10.10 Release (Intel)': 'tbd',
+      'Mac 10.10 Retina Debug (AMD)': 'tbd',
+      'Mac 10.10 Retina Release (AMD)': 'tbd',
+      'Mac Retina Debug': 'tbd',
+      'Mac Retina Release': 'tbd',
+      'Win7 Audio': 'tbd',
+      'Win7 Debug (ATI)': 'tbd',
+      'Win7 Debug (NVIDIA)': 'tbd',
+      'Win7 Release (ATI)': 'tbd',
+      'Win7 Release (Intel)': 'tbd',
+      'Win7 Release (NVIDIA GeForce 730)': 'tbd',
+      'Win7 Release (NVIDIA)': 'tbd',
+      'Win7 x64 Debug (NVIDIA)': 'tbd',
+      'Win7 x64 Release (NVIDIA)': 'tbd',
+      'Win8 Debug (NVIDIA)': 'tbd',
+      'Win8 Release (NVIDIA)': 'tbd',
+
+      'GPU Linux Builder (dbg)': 'swarming_gpu_fyi_tests_gn_debug_bot',
+      'GPU Linux Builder': 'swarming_gpu_fyi_tests_gn_release_bot',
+      'Linux Debug (NVIDIA)': 'none',
+      'Linux Debug (NVIDIA)': 'none',
+      'Linux Release (ATI)': 'none',
+      'Linux Release (Intel Graphics Stack)': 'none',
+      'Linux Release (NVIDIA)': 'none',
+    },
+
     'chromium.linux': {
       'Android Arm64 Builder (dbg)':
         'swarming_android_gyp_debug_static_bot_arm64',
@@ -68,16 +285,172 @@
       'Linux Tests (dbg)(1)(32)': 'none',
       'Linux Tests': 'none',
     },
+
     'chromium.mac': {
+      'Mac Builder': 'tbd',
+      'Mac Builder (dbg)': 'tbd',
+      'Mac10.10 Tests': 'tbd',
+      'Mac10.11 Tests': 'tbd',
+      'Mac10.9 Tests': 'tbd',
+      'Mac10.9 Tests (dbg)': 'tbd',
+      'iOS_Device': 'tbd',
+      'iOS_Device_(ninja)': 'tbd',
+      'iOS_Device_GN': 'tbd',
+      'iOS_Simulator_(dbg)': 'tbd',
+      'iOS_Simulator_GN_(dbg)': 'tbd',
+
       'Mac GN (dbg)': 'gn_debug_static_bot',
       'Mac GN': 'gn_release_bot',
     },
+
+    'chromium.memory.fyi': {
+      'Chromium Linux ChromeOS MSan Builder': 'tbd',
+      'Chromium Linux MSan Builder': 'tbd',
+      'Chromium Linux TSan Builder': 'tbd',
+      'Linux ChromeOS MSan Tests': 'tbd',
+      'Linux MSan Tests': 'tbd',
+      'Linux TSan Tests': 'tbd',
+
+      'Chromium Linux Builder (valgrind)': 'gyp_valgrind_release_bot',
+      'Chromium OS (valgrind)(1)': 'none',
+      'Chromium OS (valgrind)(2)': 'none',
+      'Chromium OS (valgrind)(3)': 'none',
+      'Chromium OS (valgrind)(4)': 'none',
+      'Chromium OS (valgrind)(5)': 'none',
+      'Chromium OS (valgrind)(6)': 'none',
+      'Chromium OS Builder (valgrind)': 'gyp_valgrind_chromeos_release_bot',
+      'Chromium Windows Builder (DrMemory x64)':
+        'gyp_drmemory_shared_release_x64',
+      'Chromium Windows Builder (DrMemory)': 'gyp_drmemory_shared_release_x86',
+      'Linux Tests (valgrind)(1)': 'none',
+      'Linux Tests (valgrind)(2)': 'none',
+      'Linux Tests (valgrind)(3)': 'none',
+      'Linux Tests (valgrind)(4)': 'none',
+      'Linux Tests (valgrind)(5)': 'none',
+      'Windows Browser (DrMemory full) (1)': 'none',
+      'Windows Browser (DrMemory full) (10)': 'none',
+      'Windows Browser (DrMemory full) (11)': 'none',
+      'Windows Browser (DrMemory full) (12)': 'none',
+      'Windows Browser (DrMemory full) (2)': 'none',
+      'Windows Browser (DrMemory full) (3)': 'none',
+      'Windows Browser (DrMemory full) (4)': 'none',
+      'Windows Browser (DrMemory full) (5)': 'none',
+      'Windows Browser (DrMemory full) (6)': 'none',
+      'Windows Browser (DrMemory full) (7)': 'none',
+      'Windows Browser (DrMemory full) (8)': 'none',
+      'Windows Browser (DrMemory full) (9)': 'none',
+      'Windows Content Browser (DrMemory full) (1)': 'none',
+      'Windows Content Browser (DrMemory full) (2)': 'none',
+      'Windows Content Browser (DrMemory full) (3)': 'none',
+      'Windows Content Browser (DrMemory full) (4)': 'none',
+      'Windows Content Browser (DrMemory full) (5)': 'none',
+      'Windows Content Browser (DrMemory full) (6)': 'none',
+      'Windows Content Browser (DrMemory)': 'none',
+      'Windows Unit (DrMemory full) (1)': 'none',
+      'Windows Unit (DrMemory full) (2)': 'none',
+      'Windows Unit (DrMemory full) (3)': 'none',
+      'Windows Unit (DrMemory full) (4)': 'none',
+      'Windows Unit (DrMemory full) (5)': 'none',
+      'Windows Unit (DrMemory x64)': 'none',
+      'Windows Unit (DrMemory)': 'none',
+    },
+
     'chromium.mojo': {
       'Chromium Mojo Android': 'android_gn_release_bot',
       'Chromium Mojo Linux': 'gn_release_bot',
       'Chromium Mojo Windows': 'gn_release_bot_minimal_symbols_x86',
     },
+
     'chromium.perf': {
+      'Android Galaxy S5 Perf (1)': 'tbd',
+      'Android Galaxy S5 Perf (2)': 'tbd',
+      'Android Galaxy S5 Perf (3)': 'tbd',
+      'Android Nexus5 Perf (1)': 'tbd',
+      'Android Nexus5 Perf (2)': 'tbd',
+      'Android Nexus5 Perf (3)': 'tbd',
+      'Android Nexus5X Perf (1)': 'tbd',
+      'Android Nexus5X Perf (2)': 'tbd',
+      'Android Nexus5X Perf (3)': 'tbd',
+      'Android Nexus6 Perf (1)': 'tbd',
+      'Android Nexus6 Perf (2)': 'tbd',
+      'Android Nexus6 Perf (3)': 'tbd',
+      'Android Nexus7v2 Perf (1)': 'tbd',
+      'Android Nexus7v2 Perf (2)': 'tbd',
+      'Android Nexus7v2 Perf (3)': 'tbd',
+      'Android Nexus9 Perf (1)': 'tbd',
+      'Android Nexus9 Perf (2)': 'tbd',
+      'Android Nexus9 Perf (3)': 'tbd',
+      'Android One Perf (1)': 'tbd',
+      'Android One Perf (2)': 'tbd',
+      'Android One Perf (3)': 'tbd',
+      'Linux Perf (1)': 'tbd',
+      'Linux Perf (2)': 'tbd',
+      'Linux Perf (3)': 'tbd',
+      'Linux Perf (4)': 'tbd',
+      'Linux Perf (5)': 'tbd',
+      'Mac 10.10 Perf (1)': 'tbd',
+      'Mac 10.10 Perf (2)': 'tbd',
+      'Mac 10.10 Perf (3)': 'tbd',
+      'Mac 10.10 Perf (4)': 'tbd',
+      'Mac 10.10 Perf (5)': 'tbd',
+      'Mac 10.11 Perf (1)': 'tbd',
+      'Mac 10.11 Perf (2)': 'tbd',
+      'Mac 10.11 Perf (3)': 'tbd',
+      'Mac 10.11 Perf (4)': 'tbd',
+      'Mac 10.11 Perf (5)': 'tbd',
+      'Mac HDD Perf (1)': 'tbd',
+      'Mac HDD Perf (2)': 'tbd',
+      'Mac HDD Perf (3)': 'tbd',
+      'Mac HDD Perf (4)': 'tbd',
+      'Mac HDD Perf (5)': 'tbd',
+      'Mac Retina Perf (1)': 'tbd',
+      'Mac Retina Perf (2)': 'tbd',
+      'Mac Retina Perf (3)': 'tbd',
+      'Mac Retina Perf (4)': 'tbd',
+      'Mac Retina Perf (5)': 'tbd',
+      'Win 10 Perf (1)': 'tbd',
+      'Win 10 Perf (2)': 'tbd',
+      'Win 10 Perf (3)': 'tbd',
+      'Win 10 Perf (4)': 'tbd',
+      'Win 10 Perf (5)': 'tbd',
+      'Win 7 ATI GPU Perf (1)': 'tbd',
+      'Win 7 ATI GPU Perf (2)': 'tbd',
+      'Win 7 ATI GPU Perf (3)': 'tbd',
+      'Win 7 ATI GPU Perf (4)': 'tbd',
+      'Win 7 ATI GPU Perf (5)': 'tbd',
+      'Win 7 Intel GPU Perf (1)': 'tbd',
+      'Win 7 Intel GPU Perf (2)': 'tbd',
+      'Win 7 Intel GPU Perf (3)': 'tbd',
+      'Win 7 Intel GPU Perf (4)': 'tbd',
+      'Win 7 Intel GPU Perf (5)': 'tbd',
+      'Win 7 Low-End Perf (1)': 'tbd',
+      'Win 7 Low-End Perf (2)': 'tbd',
+      'Win 7 Nvidia GPU Perf (1)': 'tbd',
+      'Win 7 Nvidia GPU Perf (2)': 'tbd',
+      'Win 7 Nvidia GPU Perf (3)': 'tbd',
+      'Win 7 Nvidia GPU Perf (4)': 'tbd',
+      'Win 7 Nvidia GPU Perf (5)': 'tbd',
+      'Win 7 Perf (1)': 'tbd',
+      'Win 7 Perf (2)': 'tbd',
+      'Win 7 Perf (3)': 'tbd',
+      'Win 7 Perf (4)': 'tbd',
+      'Win 7 Perf (5)': 'tbd',
+      'Win 7 x64 Perf (1)': 'tbd',
+      'Win 7 x64 Perf (2)': 'tbd',
+      'Win 7 x64 Perf (3)': 'tbd',
+      'Win 7 x64 Perf (4)': 'tbd',
+      'Win 7 x64 Perf (5)': 'tbd',
+      'Win 8 Perf (1)': 'tbd',
+      'Win 8 Perf (2)': 'tbd',
+      'Win 8 Perf (3)': 'tbd',
+      'Win 8 Perf (4)': 'tbd',
+      'Win 8 Perf (5)': 'tbd',
+      'Win Zenbook Perf (1)': 'tbd',
+      'Win Zenbook Perf (2)': 'tbd',
+      'Win Zenbook Perf (3)': 'tbd',
+      'Win Zenbook Perf (4)': 'tbd',
+      'Win Zenbook Perf (5)': 'tbd',
+
       'Android Builder': 'gn_official_goma_minimal_symbols_android',
       'Android arm64 Builder':
         'gn_official_goma_minimal_symbols_android_arm64',
@@ -86,14 +459,23 @@
       'Win Builder': 'gyp_official_goma_minimal_symbols_x86',
       'Win x64 Builder': 'gyp_official_goma_minimal_symbols_x64',
     },
-    'chromium.win': {
-      # Windows bots take too long to link w/ full symbols and time out.
-      'Win x64 GN (dbg)': 'gn_debug_bot_minimal_symbols',
-      'Win x64 GN': 'gn_release_bot_minimal_symbols',
-      'Win8 Aura': 'gn_release_bot_minimal_symbols_x86',
-      'Win8 GN (dbg)': 'gn_debug_bot_minimal_symbols_x86',
+
+    'client.skia': {
+      'Linux Builder': 'swarming_gn_release_bot',
+      'Linux Builder-Trybot': 'swarming_gn_release_bot',
+      'Linux Tests': 'swarming_gn_release_bot',
+    },
+
+    'client.v8.fyi': {
+      'Linux Debug Builder': 'gn_debug_bot',
+      'V8 Android GN (dbg)': 'android_gn_debug_bot',
+      'V8 Linux GN': 'gn_release_bot',
     },
+
     'chromium.webkit': {
+      'WebKit Linux non-Oilpan': 'tbd',
+      'WebKit Mac10.9': 'tbd',
+
       'Android Builder': 'gyp_release_bot_android',
       'WebKit Android (Nexus4)': 'gyp_release_bot_android',
       'WebKit Linux (dbg)': 'swarming_gn_debug_bot_x64',
@@ -129,79 +511,22 @@
       'WebKit Win7 (dbg)': 'none',
       'WebKit Win7': 'none',
     },
-    'chromium.memory.fyi': {
-      'Chromium Linux Builder (valgrind)': 'gyp_valgrind_release_bot',
-      'Chromium OS (valgrind)(1)': 'none',
-      'Chromium OS (valgrind)(2)': 'none',
-      'Chromium OS (valgrind)(3)': 'none',
-      'Chromium OS (valgrind)(4)': 'none',
-      'Chromium OS (valgrind)(5)': 'none',
-      'Chromium OS (valgrind)(6)': 'none',
-      'Chromium OS Builder (valgrind)': 'gyp_valgrind_chromeos_release_bot',
-      'Chromium Windows Builder (DrMemory x64)':
-        'gyp_drmemory_shared_release_x64',
-      'Chromium Windows Builder (DrMemory)': 'gyp_drmemory_shared_release_x86',
-      'Linux Tests (valgrind)(1)': 'none',
-      'Linux Tests (valgrind)(2)': 'none',
-      'Linux Tests (valgrind)(3)': 'none',
-      'Linux Tests (valgrind)(4)': 'none',
-      'Linux Tests (valgrind)(5)': 'none',
-      'Windows Browser (DrMemory full) (1)': 'none',
-      'Windows Browser (DrMemory full) (10)': 'none',
-      'Windows Browser (DrMemory full) (11)': 'none',
-      'Windows Browser (DrMemory full) (12)': 'none',
-      'Windows Browser (DrMemory full) (2)': 'none',
-      'Windows Browser (DrMemory full) (3)': 'none',
-      'Windows Browser (DrMemory full) (4)': 'none',
-      'Windows Browser (DrMemory full) (5)': 'none',
-      'Windows Browser (DrMemory full) (6)': 'none',
-      'Windows Browser (DrMemory full) (7)': 'none',
-      'Windows Browser (DrMemory full) (8)': 'none',
-      'Windows Browser (DrMemory full) (9)': 'none',
-      'Windows Content Browser (DrMemory full) (1)': 'none',
-      'Windows Content Browser (DrMemory full) (2)': 'none',
-      'Windows Content Browser (DrMemory full) (3)': 'none',
-      'Windows Content Browser (DrMemory full) (4)': 'none',
-      'Windows Content Browser (DrMemory full) (5)': 'none',
-      'Windows Content Browser (DrMemory full) (6)': 'none',
-      'Windows Content Browser (DrMemory)': 'none',
-      'Windows Unit (DrMemory full) (1)': 'none',
-      'Windows Unit (DrMemory full) (2)': 'none',
-      'Windows Unit (DrMemory full) (3)': 'none',
-      'Windows Unit (DrMemory full) (4)': 'none',
-      'Windows Unit (DrMemory full) (5)': 'none',
-      'Windows Unit (DrMemory x64)': 'none',
-      'Windows Unit (DrMemory)': 'none',
-    },
-    'chromium.fyi': {
-      'CFI Linux CF': 'gn_cfi_diag_release_bot',
-      'CFI Linux ToT': 'gn_cfi_release_bot',
-      'CFI Linux': 'gn_cfi_release_bot',
-      'CrWinClang64(dbg)': 'win_clang_debug_bot',
-      'Libfuzzer Upload Linux ASan': 'gn_release_libfuzzer_asan',
-      'Libfuzzer Upload Linux MSan': 'gn_release_libfuzzer_msan',
-      'Linux ARM': 'swarming_gyp_release_bot_arm',
-      'Site Isolation Linux': 'gn_release_trybot',
-      'Site Isolation Win': 'gyp_release_trybot_x64',
-      'Win LKGR (DrM 64)': 'gn_release_drmemory_drfuzz',
-      'Win LKGR (DrM)': 'gn_release_drmemory_drfuzz_x86',
-    },
-    'chromium.gpu': {
-      'GPU Linux Builder (dbg)': 'swarming_gpu_tests_gn_debug_bot',
-      'GPU Linux Builder': 'swarming_gpu_tests_gn_release_bot',
-      'Linux Debug (NVIDIA)': 'none',
-      'Linux Release (NVIDIA)': 'none',
-    },
-    'chromium.gpu.fyi': {
-      'GPU Linux Builder (dbg)': 'swarming_gpu_fyi_tests_gn_debug_bot',
-      'GPU Linux Builder': 'swarming_gpu_fyi_tests_gn_release_bot',
-      'Linux Debug (NVIDIA)': 'none',
-      'Linux Debug (NVIDIA)': 'none',
-      'Linux Release (ATI)': 'none',
-      'Linux Release (Intel Graphics Stack)': 'none',
-      'Linux Release (NVIDIA)': 'none',
-    },
+
     'chromium.webrtc.fyi': {
+      'Android Builder (dbg)': 'tbd',
+      'Android Builder ARM64 (dbg)': 'tbd',
+      'Android Tests (dbg) (K Nexus5)': 'tbd',
+      'Android Tests (dbg) (L Nexus5)': 'tbd',
+      'Android Tests (dbg) (L Nexus6)': 'tbd',
+      'Android Tests (dbg) (L Nexus7.2)': 'tbd',
+      'Android Tests (dbg) (L Nexus9)': 'tbd',
+
+      'Linux Tester': 'tbd',
+      'Mac Builder': 'tbd',
+      'Mac Tester': 'tbd',
+      'Win Builder': 'tbd',
+      'Win10 Tester': 'tbd',
+      'Win7 Tester': 'tbd',
       'Android GN (dbg)': 'android_gn_debug_bot',
       'Android GN': 'android_gn_release_bot',
       'Linux Builder': 'gn_release_bot_chrome_with_codecs',
@@ -210,26 +535,51 @@
       'Win x64 GN (dbg)': 'gn_debug_bot_minimal_symbols_chrome_with_codecs',
       'Win x64 GN': 'gn_release_bot_minimal_symbols_chrome_with_codecs',
     },
-    'client.skia': {
-      'Linux Builder': 'swarming_gn_release_bot',
-      'Linux Builder-Trybot': 'swarming_gn_release_bot',
-      'Linux Tests': 'swarming_gn_release_bot',
-    },
-    'client.v8.fyi': {
-      'Linux Debug Builder': 'gn_debug_bot',
-      'V8 Android GN (dbg)': 'android_gn_debug_bot',
-      'V8 Linux GN': 'gn_release_bot',
+
+    'chromium.win': {
+      'Win 7 Tests x64 (1)': 'tbd',
+      'Win Builder': 'tbd',
+      'Win Builder (dbg)': 'tbd',
+      'Win x64 Builder': 'tbd',
+      'Win x64 Builder (dbg)': 'tbd',
+      'Win7 (32) Tests': 'tbd',
+      'Win7 Tests (1)': 'tbd',
+      'Win7 Tests (dbg)(1)': 'tbd',
+
+      # Windows bots take too long to link w/ full symbols and time out.
+      'Win x64 GN (dbg)': 'gn_debug_bot_minimal_symbols',
+      'Win x64 GN': 'gn_release_bot_minimal_symbols',
+      'Win8 Aura': 'gn_release_bot_minimal_symbols_x86',
+      'Win8 GN (dbg)': 'gn_debug_bot_minimal_symbols_x86',
     },
+
     'official.desktop': {
+      'mac64': 'tbd',
+      'win': 'tbd',
+      'win-asan': 'tbd',
+      'win-pgo': 'tbd',
+      'win64': 'tbd',
+      'win64-pgo': 'tbd',
+
       'blimp-engine': 'gn_blimp_debug',
       'precise64': 'gn_official',
     },
+
     'official.desktop.continuous': {
+      'mac beta': 'tbd',
+      'mac stable': 'tbd',
+      'mac trunk': 'tbd',
+      'win beta': 'tbd',
+      'win stable': 'tbd',
+      'win trunk': 'tbd',
+
       'precise64 beta': 'gn_official',
       'precise64 stable': 'gn_official',
       'precise64 trunk': 'gn_official',
     },
+
     'tryserver.blink': {
+      'linux_chromium_gn_rel': 'tbd',
       'blink_presubmit': 'none',
       'linux_blink_compile_dbg':
         'swarming_gn_debug_bot_minimal_symbols_x64',
@@ -272,7 +622,17 @@
         'swarming_gyp_non_oilpan_release_trybot_minimal_symbols_x86',
       'win_blink_rel': 'swarming_gyp_release_trybot_minimal_symbols_x86',
     },
+
     'tryserver.chromium.android': {
+      'android_amp': 'tbd',
+      'android_archive_rel_ng': 'tbd',
+      'android_blink_rel': 'tbd',
+      'android_chromium_variable': 'tbd',
+      'android_coverage': 'tbd',
+      'android_cronet_tester': 'tbd',
+      'android_deterministic': 'tbd',
+      'cast_shell_android': 'tbd',
+
       'android_arm64_dbg_recipe': 'swarming_android_gyp_debug_trybot_arm64',
       'android_chromium_gn_compile_dbg': 'android_gn_debug_trybot',
       'android_chromium_gn_compile_rel': 'android_gn_release_trybot',
@@ -286,11 +646,43 @@
       'linux_android_dbg_ng': 'swarming_android_gyp_debug_trybot',
       'linux_android_rel_ng': 'swarming_android_gyp_release_trybot',
     },
+
     'tryserver.chromium.angle': {
+      'mac_angle_dbg_ng': 'tbd',
+      'mac_angle_rel_ng': 'tbd',
+      'win_angle_dbg_ng': 'tbd',
+      'win_angle_rel_ng': 'tbd',
+      'win_angle_x64_dbg_ng': 'tbd',
+      'win_angle_x64_rel_ng': 'tbd',
+
       'linux_angle_dbg_ng': 'swarming_gpu_fyi_tests_gn_debug_trybot',
       'linux_angle_rel_ng': 'swarming_gpu_fyi_tests_gn_release_trybot',
     },
+
     'tryserver.chromium.linux': {
+      'Chromium Linux Codesearch Builder': 'tbd',
+      'ChromiumOS Codesearch Builder': 'tbd',
+      'chromeos_amd64-generic_chromium_compile_only_ng': 'tbd',
+      'chromeos_daisy_chromium_compile_only_ng': 'tbd',
+      'chromeos_x86-generic_chromium_compile_only_ng': 'tbd',
+      'chromium_presubmit': 'tbd',
+      'depot_tools_presubmit': 'tbd',
+      'linux_chromium_archive_rel_32_ng': 'tbd',
+      'linux_chromium_asan_variable': 'tbd',
+      'linux_chromium_browser_side_navigation_rel': 'tbd',
+      'linux_chromium_chromeos_asan_rel_ng': 'tbd',
+      'linux_chromium_chromeos_asan_variable': 'tbd',
+      'linux_chromium_chromeos_compile_dbg_ng': 'tbd',
+      'linux_chromium_chromeos_compile_rel_ng': 'tbd',
+      'linux_chromium_chromeos_dbg_ng': 'tbd',
+      'linux_chromium_chromeos_msan_rel_ng': 'tbd',
+      'linux_chromium_chromeos_ozone_rel_ng': 'tbd',
+      'linux_chromium_chromeos_rel_ng': 'tbd',
+      'linux_chromium_chromeos_variable': 'tbd',
+      'linux_chromium_variable': 'tbd',
+      'linux_nacl_sdk': 'tbd',
+      'linux_nacl_sdk_build': 'tbd',
+
       'cast_shell_linux': 'cast_gn_release_trybot',
       'linux_arm': 'swarming_gyp_release_trybot_arm',
       'linux_blink_oilpan_rel':
@@ -320,12 +712,34 @@
       'linux_site_isolation': 'gn_release_trybot',
       'linux_valgrind': 'gyp_valgrind_release_bot',
     },
+
     'tryserver.chromium.mac': {
+      'ios_dbg_simulator': 'tbd',
+      'ios_dbg_simulator_gn': 'tbd',
+      'ios_dbg_simulator_ninja': 'tbd',
+      'ios_rel_device': 'tbd',
+      'ios_rel_device_gn': 'tbd',
+      'ios_rel_device_ninja': 'tbd',
+      'mac_chromium_10.10_rel_ng': 'tbd',
+      'mac_chromium_archive_rel_ng': 'tbd',
+      'mac_chromium_asan_rel_ng': 'tbd',
+      'mac_chromium_asan_variable': 'tbd',
+      'mac_chromium_compile_dbg_ng': 'tbd',
+      'mac_chromium_compile_rel_ng': 'tbd',
+      'mac_chromium_dbg_ng': 'tbd',
+      'mac_chromium_rel_ng': 'tbd',
+      'mac_chromium_variable': 'tbd',
+      'mac_deterministic': 'tbd',
+      'mac_nacl_sdk': 'tbd',
+      'mac_nacl_sdk_build': 'tbd',
+      'mac_optional_gpu_tests_rel': 'tbd',
+
       'mac_chromium_clang_upload': 'gn_release_bot',
       'mac_chromium_gn_dbg': 'gn_debug_static_bot',
       'mac_chromium_gn_rel': 'gn_release_trybot',
       'mac_chromium_gn_upload': 'gn_release_bot',
     },
+
     'tryserver.chromium.perf': {
       'android_arm64_perf_bisect_builder':
         'gn_official_goma_minimal_symbols_android_arm64',
@@ -368,7 +782,28 @@
       'winx64intel_perf_bisect': 'gyp_official_goma_minimal_symbols_x64',
       'winx64nvidia_perf_bisect': 'gyp_official_goma_minimal_symbols_x64',
     },
+
     'tryserver.chromium.win': {
+      'win10_chromium_rel_ng': 'tbd',
+      'win_archive': 'tbd',
+      'win_chromium_compile_dbg_ng': 'tbd',
+      'win_chromium_compile_dbg_ng_exp': 'tbd',
+      'win_chromium_compile_rel_ng': 'tbd',
+      'win_chromium_dbg_ng': 'tbd',
+      'win_chromium_rel_ng': 'tbd',
+      'win_chromium_rel_ng_exp': 'tbd',
+      'win_chromium_syzyasan_rel': 'tbd',
+      'win_chromium_variable': 'tbd',
+      'win_chromium_x64_rel_ng_exp': 'tbd',
+      'win_clang_dbg': 'tbd',
+      'win_clang_rel': 'tbd',
+      'win_clang_x64_rel': 'tbd',
+      'win_deterministic': 'tbd',
+      'win_nacl_sdk': 'tbd',
+      'win_nacl_sdk_build': 'tbd',
+      'win_optional_gpu_tests_rel': 'tbd',
+      'win_pgo': 'tbd',
+
       'win8_chromium_gn_dbg': 'gn_debug_bot_minimal_symbols_x86',
       'win8_chromium_gn_upload': 'gn_release_bot_minimal_symbols_x86',
       'win8_chromium_ng': 'gn_release_trybot_x86',
@@ -378,6 +813,7 @@
       'win_chromium_x64_rel_ng': 'gn_release_trybot',
       'win_clang_x64_dbg': 'win_clang_debug_bot',
     },
+
     'tryserver.v8': {
       'v8_android_chromium_gn_dbg': 'android_gn_debug_bot',
       'v8_linux_blink_rel': 'swarming_gn_release_trybot_minimal_symbols_x64',
@@ -622,10 +1058,10 @@
       'gyp', 'drmemory', 'shared', 'release', 'x64',
     ],
 
-    # This is just for completeness; any bot that uses this config
+    # This is used for tracking purposes; any bot that uses this config
     # should never actually run MB.
     'none': [
-      'none',
+      'error',
     ],
 
     'noswarming_gn_release_bot': [
@@ -883,7 +1319,7 @@
     # different from 'none' in that a bot set to 'none' should never do
     # compiles; a bot set to 'tbd' should do compiles but we haven't
     # added the entries yet.
-    # 'tbd': ['none'],
+    'tbd': ['error'],
 
     'win_clang_debug_bot': [
       'gn', 'clang', 'debug_bot_minimal_symbols',
@@ -1023,6 +1459,15 @@
       'gyp_defines': 'embedded=1',
     },
 
+    # This mixin is used to force configs that use it to fail. It
+    # is used in two cases: when we have bots that we haven't looked
+    # at yet and don't know whether they need MB or not, and for bots
+    # that are test-only and should never run MB.
+    'error': {
+      'gn_args': 'error',
+      'gyp_defines': 'target_arch=unknown',
+    },
+
     'gn_linux_upload': {
       'type': 'gn',
 
@@ -1092,14 +1537,6 @@
       'gyp_defines': 'enable_oilpan=0',
     },
 
-    # This config is used by bots that aren't building Chromium and should
-    # never be running MB. It is used for tracking purposes. These values
-    # were picked such that if someone did try to run MB, both GN and GYP
-    # should error out.
-    'none': {
-      'gn_args': 'error',
-      'gyp_defines': 'target_arch=unknown',
-    },
 
     'noswarming': {
       # test_isolation_mode doesn't exist in a GN build (it's always a no-op).