Prepare for blink bots to be moved to MB.

tools/mb/mb_config.pyl

Index: tools/mb/mb_config.pyl
diff --git a/tools/mb/mb_config.pyl b/tools/mb/mb_config.pyl
index 41bab4957001856e32c43c45e8b2fd1a1694e4ac..0c5f2f65b5934c1ecfa54178676cb5e349b94f8a 100644
--- a/tools/mb/mb_config.pyl
+++ b/tools/mb/mb_config.pyl
@@ -15,12 +15,10 @@
     'android_aura_gn_debug_bot': ['android', 'gn', 'debug_bot', 'aura'],
     'android_gn_release_bot': ['android', 'gn', 'release_bot'],
     'android_gn_release_trybot': ['android', 'gn', 'release_trybot'],
-    'android_gyp_debug_bot': ['android', 'gyp', 'debug_bot'],
     'android_gyp_debug_static_bot': ['android', 'gyp', 'debug_static_bot'],
     'android_gyp_debug_static_bot_arm64': ['android', 'gyp', 'debug_static_bot', 'arm64'],
     'android_gyp_release_bot': ['android', 'gyp', 'release_bot'],
     'android_gyp_release_bot_minimal_symbols': ['android', 'gyp', 'release_bot', 'minimal_symbols'],
-    'android_gyp_release_trybot': ['android', 'gyp', 'release_trybot'],
     'cast_gyp_release_bot': ['cast', 'gyp', 'release_bot'],
     'cast_gyp_release_trybot': ['cast', 'gyp', 'release_trybot'],
     'chromeos_gn_debug_bot': ['chromeos', 'gn', 'debug_bot'],
@@ -52,8 +50,21 @@
     'gn_release_bot_minimal_symbols_x86': ['gn', 'release_bot_minimal_symbols', 'x86'],
     'gn_release_trybot': ['gn', 'release_trybot'],
     'gn_release_trybot_x86': ['gn', 'release_trybot', 'x86'],
+    'gyp_asan_lsan_release_bot_x64': ['gyp', 'asan', 'lsan', 'release_bot', 'x64'],
     'gyp_debug_bot': ['gyp', 'debug_bot'],
+    'gyp_debug_bot_x64': ['gyp', 'debug_bot', 'x64'],
     'gyp_debug_bot_x86': ['gyp', 'debug_bot', 'x86'],
+    'gyp_debug_bot_minimal_symbols_x64': ['gyp', 'debug_bot_minimal_symbols', 'x64'],
+    'gyp_debug_bot_minimal_symbols_x86': ['gyp', 'debug_bot_minimal_symbols', 'x86'],
+    'gyp_msan_release_bot_x64': ['gyp', 'msan', 'release_bot', 'x64'],
+    'gyp_oilpan_asan_lsan_release_bot_x64': ['gyp', 'oilpan', 'asan', 'lsan', 'release_bot', 'x64'],
+    'gyp_oilpan_debug_bot_minimal_symbols_x64': ['gyp', 'oilpan', 'debug_bot', 'minimal_symbols', 'x64'],
+    'gyp_oilpan_debug_bot_minimal_symbols_x86': ['gyp', 'oilpan', 'debug_bot', 'minimal_symbols', 'x86'],
+    'gyp_oilpan_debug_bot_x64': ['gyp', 'oilpan', 'debug_bot', 'minimal_symbols', 'x86'],
+    'gyp_oilpan_release_bot_minimal_symbols_x86': ['gyp', 'oilpan', 'release_bot', 'minimal_symbols', 'x86'],
+    'gyp_oilpan_release_bot_x64': ['gyp', 'oilpan', 'release_bot', 'x64'],
+    'gyp_oilpan_release_trybot_minimal_symbols_x64': ['gyp', 'oilpan', 'release_trybot', 'minimal_symbols', 'x64'],
+    'gyp_oilpan_release_trybot_minimal_symbols_x86': ['gyp', 'oilpan', 'release_trybot', 'minimal_symbols', 'x86'],
     'gyp_official_goma': ['gyp', 'official', 'goma'],
     'gyp_official_goma_chromeos': ['gyp', 'official', 'goma', 'chromeos'],
     'gyp_official_goma_x86': ['gyp', 'official', 'goma', 'x86'],
@@ -61,11 +72,20 @@
     'gyp_official_goma_minimal_symbols_android_arm64': ['gyp', 'official', 'goma', 'minimal_symbols', 'android', 'arm64'],
     'gyp_official_goma_minimal_symbols_x64': ['gyp', 'official', 'goma', 'minimal_symbols', 'x64'],
     'gyp_official_goma_minimal_symbols_x86': ['gyp', 'official', 'goma', 'minimal_symbols', 'x86'],
+    'gyp_release_bot_android': ['gyp', 'release_bot', 'android'],
+    'android_gyp_release_bot_minimal_symbols': ['android', 'gyp', 'release_bot', 'minimal_symbols'],
+    'gyp_release_bot_x64': ['gyp', 'release_bot', 'x64'],
+    'gyp_release_bot_x86': ['gyp', 'release_bot', 'x86'],
+    'gyp_release_bot_minimal_symbols_x64': ['gyp', 'release_bot_minimal_symbols', 'x64'],
+    'gyp_release_bot_minimal_symbols_x86': ['gyp', 'release_bot_minimal_symbols', 'x86'],
     'gyp_release_trybot': ['gyp', 'release_trybot'],
     'gyp_release_trybot_x64': ['gyp', 'release_trybot', 'x64'],
+    'gyp_release_trybot_minimal_symbols_x64': ['gyp', 'release_trybot', 'minimal_symbols', 'x64'],
+    'gyp_release_trybot_minimal_symbols_x86': ['gyp', 'release_trybot', 'minimal_symbols', 'x86'],
     'libfuzzer_upload_bot': ['gn', 'release', 'libfuzzer', 'asan', 'proprietary_codecs'],
 
-    # This is just for completeness; any bot that uses this config should never actually run MB.
+    # This is just for completeness; any bot that uses this config
+    # should never actually run MB.
     'none': ['none'],
 
     'noswarming_gn_release_bot': ['noswarming', 'gn', 'release_bot'],
@@ -90,6 +110,12 @@
     'swarming_gyp_release_trybot_arm': ['swarming', 'gyp', 'release_trybot', 'arm', 'crosscompile'],
     'swarming_tsan_gyp_release_trybot': ['swarming', 'disable_nacl', 'tsan', 'gyp', 'release_trybot'],
 
+    # This indicates that we haven't yet set up this bot w/ MB. This is
+    # 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'],

[Paweł Hajdan Jr., 2015/12/09 11:04:43]

It's commented out anyway, so why are we adding it?

[Dirk Pranke, 2015/12/09 16:47:10]

I want to keep this in the file because I will probably need it from time to
time (I did in earlier versions of this patch).
MB's presubmit checks complain when entries are unused, so it needs to be
commented out or deleted, and deleting and re-adding is annoying.

+
     # clang/win doesn't work with goma yet, so this can't use debug_bot:
     'win_clang_debug_bot': ['gn', 'clang', 'debug', 'shared', 'minimal_symbols'],
   },
@@ -276,6 +302,11 @@
       'gyp_defines': 'fastbuild=2',
     },
 
+    'oilpan': {
+      'gn_args': 'enable_oilpan=true',
+      'gyp_defines': 'enable_oilpan=1',
+    },
+
     # 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
@@ -439,10 +470,39 @@
       'Win8 GN (dbg)': 'gn_debug_bot_minimal_symbols_x86',
     },
     'chromium.webkit': {
-      'Android GN': 'android_gn_release_bot',
-      'Android GN (dbg)': 'android_gn_debug_bot',
-      'Linux GN': 'gn_release_bot',
-      'Linux GN (dbg)': 'gn_debug_bot'
+      'WebKit Win Builder': 'gyp_release_bot_minimal_symbols_x86',
+      'WebKit XP': 'none',
+      'WebKit Win7': 'none',
+      'WebKit Win10': 'none',
+      'WebKit Win x64 Builder': 'gyp_release_bot_minimal_symbols_x64',
+      'WebKit Win Oilpan': 'gyp_oilpan_release_bot_minimal_symbols_x86',
+      'WebKit Win Builder (dbg)': 'gyp_debug_bot_minimal_symbols_x86',
+      'WebKit Win7 (dbg)': 'none',
+      'WebKit Win Oilpan (dbg)': 'gyp_oilpan_debug_bot_minimal_symbols_x86',
+      'WebKit Win x64 Builder (dbg)': 'gyp_debug_bot_minimal_symbols_x64',
+      'WebKit Mac Builder': 'gyp_release_bot_x64',
+      'WebKit Mac10.6': 'none',
+      'WebKit Mac10.7': 'none',
+      'WebKit Mac10.8': 'none',
+      'WebKit Mac10.9 (retina)': 'gyp_release_bot_x64',
+      'WebKit Mac10.10': 'none',
+      'WebKit Mac Oilpan': 'gyp_oilpan_release_bot_x64',
+      'WebKit Mac Builder (dbg)': 'gyp_debug_bot_x64',
+      'WebKit Mac10.7 (dbg)': 'none',
+      'WebKit Mac Oilpan (dbg)': 'gyp_oilpan_debug_bot_x64',
+      'WebKit Linux': 'gyp_release_bot_x64',
+      'WebKit Linux Trusty': 'gyp_release_bot_x64',
+      'WebKit Linux 32': 'gyp_release_bot_x86',
+      'WebKit Linux Oilpan': 'gyp_oilpan_release_bot_x64',
+      'WebKit Linux ASAN': 'gyp_asan_lsan_release_bot_x64',
+      'WebKit Linux Oilpan ASAN': 'gyp_oilpan_asan_lsan_release_bot_x64',
+      'WebKit Linux MSAN': 'gyp_msan_release_bot_x64',
+      'WebKit Linux Leak': 'gyp_release_bot_x64',
+      'WebKit Linux Oilpan Leak': 'gyp_oilpan_release_bot_x64',
+      'WebKit Linux (dbg)': 'gyp_debug_bot_x64',
+      'WebKit Linux Oilpan (dbg)': 'gyp_oilpan_debug_bot_x64',
+      'Android Builder': 'gyp_release_bot_android',
+      'WebKit Android (Nexus4)': 'gyp_release_bot_android',
     },
     'chromium.fyi': {
       'CFI Linux': 'gn_cfi_bot',
@@ -480,10 +540,29 @@
       'precise64 trunk': 'gn_official',
     },
     'tryserver.blink': {
-      'android_blink_compile_dbg': 'android_gyp_debug_bot',
-      'android_blink_compile_rel': 'android_gyp_release_trybot',
-      'android_chromium_gn_compile_rel': 'android_gn_release_bot',
-      'linux_chromium_gn_rel': 'gn_release_bot',
+      'linux_blink_dbg': 'gyp_debug_bot_minimal_symbols_x64',
+      'linux_blink_compile_dbg': 'gyp_debug_bot_minimal_symbols_x64',
+      'linux_blink_compile_rel': 'gyp_release_trybot_minimal_symbols_x64',
+      'linux_blink_rel': 'gyp_release_trybot_minimal_symbols_x64',
+      'mac_blink_dbg': 'gyp_debug_bot_minimal_symbols_x64',
+      'mac_blink_compile_dbg': 'gyp_debug_bot_minimal_symbols_x64',
+      'mac_blink_compile_rel': 'gyp_release_bot_minimal_symbols_x64',
+      'mac_blink_rel': 'gyp_release_trybot_minimal_symbols_x64',
+      'win_blink_dbg': 'gyp_debug_bot_minimal_symbols_x86',
+      'win_blink_compile_dbg': 'gyp_debug_bot_minimal_symbols_x86',
+      'win_blink_compile_rel': 'gyp_release_trybot_minimal_symbols_x86',
+      'win_blink_rel': 'gyp_release_trybot_minimal_symbols_x86',
+      'linux_blink_oilpan_dbg': 'gyp_oilpan_debug_bot_minimal_symbols_x64',
+      'linux_blink_oilpan_rel': 'gyp_oilpan_release_trybot_minimal_symbols_x64',
+      'linux_blink_oilpan_compile_rel': 'gyp_oilpan_release_trybot_minimal_symbols_x64',
+      'mac_blink_oilpan_dbg': 'gyp_oilpan_debug_bot_minimal_symbols_x64',
+      'mac_blink_oilpan_rel': 'gyp_oilpan_release_trybot_minimal_symbols_x64',
+      'mac_blink_oilpan_compile_rel': 'gyp_oilpan_release_trybot_minimal_symbols_x64',
+      'win_blink_oilpan_dbg': 'gyp_oilpan_debug_bot_minimal_symbols_x86',
+      'win_blink_oilpan_rel': 'gyp_oilpan_release_trybot_minimal_symbols_x86',
+      'win_blink_oilpan_compile_rel': 'gyp_oilpan_release_trybot_minimal_symbols_x86',
+      'linux_blink_rel_ng': 'gyp_release_trybot_minimal_symbols_x64',
+      'blink_presubmit': 'none',
     },
     'tryserver.chromium.android': {
       'android_chromium_gn_rel': 'android_gn_release_trybot',