Flip webkit bots to GN (again)

tools/mb/mb_config.pyl

 # Copyright 2015 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   # 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.
   'masters': {
     # Take care when changing any of these builders to ensure that you do not
@@ skipping 511 matching lines @@
     },
 
     'client.v8.fyi': {
       'Android Builder': 'gn_official_goma_minimal_symbols_android',
       'Linux Debug Builder': 'gn_debug_bot',
       'V8 Android GN (dbg)': 'android_gn_debug_bot',
       'V8 Linux GN': 'gn_release_bot',
       'V8-Blink Linux 64': 'noswarming_gn_release_bot_x64',
       'V8-Blink Linux 64 - ignition': 'noswarming_gn_release_bot_x64',
       'V8-Blink Linux 64 (dbg)': 'noswarming_gn_debug_bot_x64',
-      'V8-Blink Mac': 'noswarming_gyp_release_bot_x64',
-      'V8-Blink Win': 'noswarming_gyp_release_bot_minimal_symbols_x86',
+      'V8-Blink Mac': 'noswarming_gn_release_bot_x64',
+      'V8-Blink Win': 'noswarming_gn_release_bot_minimal_symbols_x86',
     },
 
     'chromium.webkit': {
       'Android Builder': 'android_gn_release_bot_minimal_symbols',
       'WebKit Android (Nexus4)': 'none',
       'WebKit Linux (dbg)': 'swarming_gn_debug_bot',
       'WebKit Linux ASAN': 'swarming_gn_asan_lsan_release_bot',
       'WebKit Linux Leak': 'swarming_gn_release_bot',
       'WebKit Linux MSAN': 'swarming_gn_msan_release_bot',
       'WebKit Linux Trusty': 'swarming_gn_release_bot',
       'WebKit Linux': 'swarming_gn_release_bot',
-      'WebKit Mac Builder (dbg)': 'swarming_gyp_debug_bot',
-      'WebKit Mac Builder': 'swarming_gyp_release_bot',
+      'WebKit Mac Builder (dbg)': 'swarming_gn_debug_bot',
+      'WebKit Mac Builder': 'swarming_gn_release_bot',
       'WebKit Mac10.10': 'none',
       'WebKit Mac10.11 (dbg)': 'none',
-      'WebKit Mac10.11 (retina)': 'swarming_gyp_release_bot',
+      'WebKit Mac10.11 (retina)': 'swarming_gn_release_bot',
       'WebKit Mac10.11': 'none',
-      'WebKit Mac10.9': 'swarming_gyp_release_bot',
-      'WebKit Win Builder (dbg)': 'swarming_gyp_debug_bot_minimal_symbols_x86',
-      'WebKit Win Builder': 'swarming_gyp_release_bot_minimal_symbols_x86',
+      'WebKit Mac10.9': 'swarming_gn_release_bot',
+      'WebKit Win Builder (dbg)': 'swarming_gn_debug_bot_minimal_symbols_x86',
+      'WebKit Win Builder': 'swarming_gn_release_bot_minimal_symbols_x86',
       'WebKit Win x64 Builder (dbg)':
         'swarming_gn_debug_bot_minimal_symbols_x64',
       'WebKit Win x64 Builder': 'swarming_gn_release_bot_minimal_symbols_x64',
       'WebKit Win10': 'none',
       'WebKit Win7 (dbg)': 'none',
       'WebKit Win7': 'none',
     },
 
     'chromium.webrtc': {
       'Linux Builder': 'gn_release_bot_chrome_with_codecs',
@@ skipping 72 matching lines @@
     'tryserver.blink': {
       # Most tryservers should have '_trybot' in their config names, but
       # 'release_trybot' includes 'dcheck_always_on', and the blink
       # release trybots must *not* enable dchecks, because that could
       # cause them to produce different baselines than the release
       # waterfall bots, and run-webkit-tests can't handle that (by design).
       'linux_blink_compile_dbg': 'swarming_gn_debug_trybot',
       'linux_blink_compile_rel': 'swarming_gn_release_bot_minimal_symbols',
       'linux_blink_dbg': 'swarming_gn_debug_trybot',
       'linux_blink_rel': 'swarming_gn_release_bot_minimal_symbols',
-      'mac_blink_compile_dbg': 'swarming_gyp_debug_trybot',
-      'mac_blink_compile_rel': 'swarming_gyp_release_bot_minimal_symbols',
-      'mac_blink_dbg': 'swarming_gyp_debug_trybot',
-      'mac_blink_rel': 'swarming_gyp_release_bot_minimal_symbols',
-      'win_blink_compile_dbg': 'swarming_gyp_debug_trybot_x86',
-      'win_blink_compile_rel': 'swarming_gyp_release_bot_minimal_symbols_x86',
-      'win_blink_dbg': 'swarming_gyp_debug_trybot_x86',
-      'win_blink_rel': 'swarming_gyp_release_bot_minimal_symbols_x86',
+      'mac_blink_compile_dbg': 'swarming_gn_debug_trybot',
+      'mac_blink_compile_rel': 'swarming_gn_release_bot_minimal_symbols',
+      'mac_blink_dbg': 'swarming_gn_debug_trybot',
+      'mac_blink_rel': 'swarming_gn_release_bot_minimal_symbols',
+      'win_blink_compile_dbg': 'swarming_gn_debug_trybot_x86',
+      'win_blink_compile_rel': 'swarming_gn_release_bot_minimal_symbols_x86',
+      'win_blink_dbg': 'swarming_gn_debug_trybot_x86',
+      'win_blink_rel': 'swarming_gn_release_bot_minimal_symbols_x86',
     },
 
     'tryserver.chromium.android': {
       'android_archive_rel_ng': 'android_gn_release_trybot',
       'android_arm64_dbg_recipe': 'swarming_android_gn_debug_trybot_arm64',
       'android_blink_rel': 'swarming_android_gn_release_trybot',
       'android_chromium_gn_compile_dbg': 'android_gn_debug_trybot',
       'android_chromium_gn_compile_rel': 'android_gn_release_trybot',
       'android_chromium_gn_rel': 'android_gn_release_trybot',
       'android_chromium_variable': 'findit',
@@ skipping 738 matching lines @@
     ],
 
     'noswarming_gn_release_bot': [
       'noswarming', 'gn', 'release_bot',
     ],
 
     'noswarming_gn_release_bot_minimal_symbols_x64': [
       'noswarming', 'gn', 'release_bot', 'minimal_symbols', 'x64',
     ],
 
+    'noswarming_gn_release_bot_minimal_symbols_x86': [
+      'noswarming', 'gn', 'release_bot', 'minimal_symbols', 'x86',
+    ],
+
     'noswarming_gn_release_bot_x64': [
       'noswarming', 'gn', 'release_bot', 'x64',
     ],
 
     'noswarming_gyp_release_bot_mac_strip': [
       'noswarming', 'gyp', 'release_bot', 'mac_strip',
     ],
 
     'noswarming_gyp_release_bot_minimal_symbols_x86': [
       'noswarming', 'gyp', 'release_bot', 'minimal_symbols', 'x86',
     ],
 
-    'noswarming_gyp_release_bot_x64': [
-      'noswarming', 'gyp', 'release_bot', 'x64',
-    ],
-
     'noswarming_gyp_release_trybot': [
       'noswarming', 'gyp', 'release_trybot',
     ],
 
     'noswarming_gyp_release_trybot_x64': [
       'noswarming', 'gyp', 'release_trybot', 'x64',
     ],
 
     'noswarming_gyp_release_trybot_x86': [
       'noswarming', 'gyp', 'release_trybot', 'x86',
@@ skipping 81 matching lines @@
     ],
 
     'swarming_gn_asan_lsan_release_bot': [
       'swarming', 'gn', 'asan', 'lsan', 'release_bot',
     ],
 
     'swarming_gn_debug_bot': [
       'swarming', 'gn', 'debug_bot',
     ],
 
+    'swarming_gn_debug_bot_x86': [
+      'swarming', 'gn', 'debug_bot', 'x86',
+    ],
+
     'swarming_gn_debug_bot_minimal_symbols_x64': [
       'swarming', 'gn', 'debug_bot_minimal_symbols', 'x64',
     ],
 
-    'swarming_gn_debug_bot_x86': [
-      'swarming', 'gn', 'debug_bot', 'x86',
-    ],
-
     'swarming_gn_debug_bot_minimal_symbols_x86': [
       'swarming', 'gn', 'debug_bot_minimal_symbols', 'x86',
     ],
 
     'swarming_gn_debug_trybot': [
       'swarming', 'gn', 'debug_trybot',
     ],
 
     'swarming_gn_debug_trybot_x86': [
       'swarming', 'gn', 'debug_trybot', 'x86',
@@ skipping 253 matching lines @@
 
     'swarming_gyp_clang_tot_official_minimal_symbols_static_release_x86': [
       'swarming', 'gyp', 'clang_tot', 'official', 'minimal_symbols', 'static',
       'release', 'x86',
     ],
 
     'swarming_gyp_debug_bot': [
       'swarming', 'gyp', 'debug_bot',
     ],
 
-    'swarming_gyp_debug_bot_minimal_symbols_x86': [
-      'swarming', 'gyp', 'debug_bot_minimal_symbols', 'x86',
-    ],
-
     'swarming_gyp_debug_trybot': [
       'swarming', 'gyp', 'debug_trybot',
     ],
 
-    'swarming_gyp_debug_trybot_x86': [
-      'swarming', 'gyp', 'debug_trybot', 'x86',
-    ],
-
     'swarming_gyp_msan_release_bot': [
       'swarming', 'gyp', 'msan', 'release_bot',
     ],
 
-    'swarming_gyp_release_bot': [
-      'swarming', 'gyp', 'release_bot',
-    ],
-
-    'swarming_gyp_release_bot_minimal_symbols': [
-      'swarming', 'gyp', 'release_bot_minimal_symbols',
-    ],
-
-    'swarming_gyp_release_bot_minimal_symbols_x86': [
-      'swarming', 'gyp', 'release_bot_minimal_symbols', 'x86',
-    ],
-
     'swarming_gyp_release_trybot_arm': [
       'swarming', 'gyp', 'release_trybot', 'arm', 'crosscompile',
     ],
 
     'swarming_gyp_syzyasan_release_trybot_x86': [
       'swarming', 'gyp', 'syzyasan', 'release_trybot', 'x86',
     ],
 
     'swarming_gyp_tsan_disable_nacl_release_bot': [
       'swarming', 'gyp', 'tsan', 'disable_nacl', 'release_bot',
@@ skipping 462 matching lines @@
     },
 
     'drfuzz': { 'gn_args': 'use_drfuzz=true' },
 
     'drmemory': {
       'gn_args': 'is_component_build=true enable_iterator_debugging=false',
       'gyp_defines': 'component=shared_library build_for_tool=drmemory',
     },
   },
 }