MB: Flip Windows bots to GN by default

webrtc/build/mb_config.pyl

 # Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
 #
 # Use of this source code is governed by a BSD-style license
 # that can be found in the LICENSE file in the root of the source
 # tree. An additional intellectual property rights grant can be found
 # in the file PATENTS.  All contributing project authors may
 # be found in the AUTHORS file in the root of the source tree.
 
 # FOR DETAILS ON THIS FILE SEE THE MAIN COPY IN //tools/mb/mb_config.pyl.
 # This is configuration for standalone WebRTC bots. It is used to keep the bot
@@ skipping 64 matching lines @@
       'Android32 GN (dbg)': 'android_gyp_debug_static_bot_arm',
       'Android32 GYP': 'android_gyp_release_bot_arm',
       'Android32 GYP (dbg)': 'android_gyp_debug_static_bot_arm',
       'Android32 Tests (L Nexus5)(dbg)': 'none',
       'Android32 Tests (L Nexus5)': 'none',
       'Android32 Tests (L Nexus7.2)(dbg)': 'none',
       'Android32 Tests (L Nexus7.2)': 'none',
       'Android64 Tests (L Nexus9)': 'none',
 
       # Windows
-      'Win32 Debug': 'gyp_debug_bot_x86',
-      'Win32 Release': 'gyp_release_bot_x86',
-      'Win64 Debug': 'gyp_debug_bot_x64',
-      'Win64 Release': 'gyp_release_bot_x64',
-      'Win64 Debug (GN)': 'gn_debug_bot_x64',
-      'Win64 Release (GN)': 'gn_release_bot_x64',
-      'Win32 Debug (Clang)': 'win_gyp_clang_debug_bot_x86',
-      'Win32 Release (Clang)': 'win_gyp_clang_release_bot_x86',
-      'Win64 Debug (Clang)': 'win_gyp_clang_debug_bot_x64',
-      'Win64 Release (Clang)': 'win_gyp_clang_release_bot_x64',
-      'Win SyzyASan': 'win_gyp_syzyasan_release_bot_x86',
-      'Win DrMemory Full': 'win_gyp_drmemory_debug_bot_x86',
-      'Win DrMemory Light': 'win_gyp_drmemory_debug_bot_x86',
-      'Win32 Release [large tests]': 'gyp_release_bot_x86',
+      'Win32 Debug': 'gn_debug_bot_x86',
+      'Win32 Release': 'gn_release_bot_x86',
+      'Win64 Debug': 'gn_debug_bot_x64',
+      'Win64 Release': 'gn_release_bot_x64',
+      'Win32 Debug (Clang)': 'win_gn_clang_debug_bot_x86',
+      'Win32 Release (Clang)': 'win_gn_clang_release_bot_x86',
+      'Win64 Debug (Clang)': 'win_gn_clang_debug_bot_x64',
+      'Win64 Release (Clang)': 'win_gn_clang_release_bot_x64',
+      'Win SyzyASan': 'win_gn_syzyasan_release_bot_x86',
+      'Win DrMemory Full': 'win_gn_drmemory_debug_bot_x86',
+      'Win DrMemory Light': 'win_gn_drmemory_debug_bot_x86',
+      'Win32 Release [large tests]': 'gn_release_bot_x86',
+      # TODO(kjellander): Remove the two GN configs below as soon we've renamed
+      # the bots to the GYP versions (duplicated now).
+      'Win64 Debug (GN)': 'gyp_debug_bot_x64_exclude_tests',
+      'Win64 Release (GN)': 'gyp_release_bot_x64_exclude_tests',
+      'Win64 Debug (GYP)': 'gyp_debug_bot_x64_exclude_tests',
+      'Win64 Release (GYP)': 'gyp_release_bot_x64_exclude_tests',
     },
     'tryserver.webrtc': {
       # iOS
       'ios_dbg': 'ios_gyp_debug_static_bot_arm_device',
       'ios_rel': 'ios_gyp_release_bot_arm_device',
       'ios_arm64_dbg': 'ios_gyp_debug_static_bot_arm64_device',
       'ios_arm64_rel': 'ios_gyp_release_bot_arm64_device',
       'ios32_sim_dbg': 'ios_gyp_debug_static_bot_x86',
       'ios64_sim_dbg': 'ios_gyp_debug_static_bot_x64',
       'ios64_gn_dbg': 'ios_gn_debug_static_bot_arm64_device',
@@ skipping 50 matching lines @@
       'android_arm64_rel': 'android_gn_release_bot_arm64',
       'android_n6': 'android_gn_debug_static_bot_arm',
       # TODO(kjellander): Remove the android_gn_* configs as soon we've renamed
       # the bots to the GYP versions at the tryserver.
       'android_gn_dbg': 'android_gyp_debug_static_bot_arm',
       'android_gn_rel': 'android_gyp_release_bot_arm',
       'android_gyp_dbg': 'android_gyp_debug_static_bot_arm',
       'android_gyp_rel': 'android_gyp_release_bot_arm',
 
       # Windows
-      'win_compile_dbg': 'gyp_debug_bot_x86',
-      'win_compile_rel': 'gyp_release_bot_x86',
-      'win_compile_x64_dbg': 'gyp_debug_bot_x64',
-      'win_compile_x64_rel': 'gyp_release_bot_x64',
-      'win_dbg': 'gyp_debug_bot_x86',
-      'win_rel': 'gyp_release_bot_x86',
-      'win_x64_dbg': 'gyp_debug_bot_x64',
-      'win_x64_rel': 'gyp_release_bot_x64',
-      'win_x64_gn_dbg': 'gn_debug_bot_x64',
-      'win_x64_gn_rel': 'gn_release_bot_x64',
-      'win_clang_dbg': 'win_gyp_clang_debug_bot_x86',
-      'win_clang_rel': 'win_gyp_clang_release_bot_x86',
-      'win_x64_clang_dbg': 'win_gyp_clang_debug_bot_x64',
-      'win_x64_clang_rel': 'win_gyp_clang_release_bot_x64',
-      'win_asan': 'win_gyp_syzyasan_release_bot_x86',
-      'win_drmemory_light': 'win_gyp_drmemory_debug_bot_x86',
-      'win_drmemory_full': 'win_gyp_drmemory_debug_bot_x86',
-      'win_baremetal': 'gyp_release_bot_x86',
-      'win_swarming': 'swarming_gyp_debug_bot_x64',
+      'win_compile_dbg': 'gn_debug_bot_x86',
+      'win_compile_rel': 'gn_release_bot_x86',
+      'win_compile_x64_dbg': 'gn_debug_bot_x64',
+      'win_compile_x64_rel': 'gn_release_bot_x64',
+      'win_dbg': 'gn_debug_bot_x86',
+      'win_rel': 'gn_release_bot_x86',
+      'win_x64_dbg': 'gn_debug_bot_x64',
+      'win_x64_rel': 'gn_release_bot_x64',
+      'win_clang_dbg': 'win_gn_clang_debug_bot_x86',
+      'win_clang_rel': 'win_gn_clang_release_bot_x86',
+      'win_x64_clang_dbg': 'win_gn_clang_debug_bot_x64',
+      'win_x64_clang_rel': 'win_gn_clang_release_bot_x64',
+      'win_asan': 'win_gn_syzyasan_release_bot_x86',
+      'win_drmemory_light': 'win_gn_drmemory_debug_bot_x86',
+      'win_drmemory_full': 'win_gn_drmemory_debug_bot_x86',
+      'win_baremetal': 'gn_release_bot_x86',
+      'win_swarming': 'swarming_gn_debug_bot_x64',
+      # TODO(kjellander): Remove the two GN configs below as soon we've renamed
+      # the bots to the GYP versions (duplicated now).
+      'win_x64_gn_dbg': 'gyp_debug_bot_x64_exclude_tests',
+      'win_x64_gn_rel': 'gyp_release_bot_x64_exclude_tests',
+      'win_x64_gyp_dbg': 'gyp_debug_bot_x64_exclude_tests',
+      'win_x64_gyp_rel': 'gyp_release_bot_x64_exclude_tests',
     },
   },
 
   # This is the list of configs that you can pass to mb; each config
   # represents a particular combination of GYP_DEFINES/gn args that
   # we must support. A given config *may* be platform-specific but
   # is not necessarily so (i.e., we might have mac, win, and linux
   # bots all using the 'gn_release_bot' config).
   'configs': {
     # iOS
@@ skipping 19 matching lines @@
       'ios', 'gyp', 'debug_static_bot', 'x86'
     ],
     'ios_gyp_debug_static_bot_x64': [
       'ios', 'gyp', 'release_bot', 'x64'
     ],
 
     # Linux, Mac and Windows
     'gn_crosscompile_release_bot_arm': [
       'gn', 'crosscompile', 'openh264_release_bot', 'arm'
     ],
-    'gyp_debug_bot_x86': [
-      'gyp', 'openh264_debug_bot', 'x86'
-    ],
-    'gyp_release_bot_x86': [
-      'gyp', 'openh264_release_bot', 'x86'
-    ],
-    'gyp_debug_bot_x64': [
-      'gyp', 'openh264_debug_bot', 'x64'
-    ],
     'gyp_debug_bot_x64_exclude_tests': [
       'gyp', 'openh264_debug_bot', 'x64', 'exclude_tests', 'exclude_examples'
     ],
-    'gyp_release_bot_x64': [
-      'gyp', 'openh264_release_bot', 'x64'
-    ],
     'gyp_release_bot_x64_exclude_tests': [
       'gyp', 'openh264_release_bot', 'x64', 'exclude_tests', 'exclude_examples'
     ],
     'gn_asan_lsan_clang_release_bot_x64': [
       'gn', 'asan', 'lsan', 'clang', 'openh264_release_bot', 'x64'
     ],
     'gn_memcheck_release_bot_x64': [
       'gn', 'memcheck', 'openh264_release_bot', 'x64'
     ],
     'gn_msan_clang_release_bot_x64': [
       'gn', 'msan', 'clang', 'openh264_release_bot', 'x64'
     ],
     'gn_tsan_clang_release_bot_x64': [
       'gn', 'tsan', 'clang', 'openh264_release_bot', 'x64'
     ],
     'gn_ubsan_clang_release_bot_x64': [
       'gn', 'ubsan', 'clang', 'openh264_release_bot', 'x64'
     ],
     'gn_ubsan_vptr_clang_release_bot_x64': [
       'gn', 'ubsan_vptr', 'clang', 'openh264_release_bot', 'x64'
     ],
+    'gn_debug_bot_x86': [
+      'gn', 'openh264_debug_bot', 'x86'
+    ],
+    'gn_release_bot_x86': [
+      'gn', 'openh264_release_bot', 'x86'
+    ],
     'gn_debug_bot_x64': [
       'gn', 'openh264_debug_bot', 'x64'
     ],
     'gn_release_bot_x64': [
       'gn', 'openh264_release_bot', 'x64'
     ],
     'swarming_gn_debug_bot_x64': [
       'swarming', 'gn', 'openh264_debug_bot', 'x64'
     ],
-    'swarming_gyp_debug_bot_x64': [
-      'swarming', 'gyp', 'openh264_debug_bot', 'x64'
-    ],
 
     # Windows
-    'win_gyp_clang_debug_bot_x86': [
-      'gyp', 'clang', 'openh264_debug_bot', 'x86',
+    'win_gn_clang_debug_bot_x86': [
+      'gn', 'clang', 'openh264_debug_bot', 'x86',
     ],
-    'win_gyp_clang_release_bot_x86': [
-      'gyp', 'clang', 'openh264_release_bot', 'x86',
+    'win_gn_clang_release_bot_x86': [
+      'gn', 'clang', 'openh264_release_bot', 'x86',
     ],
-    'win_gyp_clang_debug_bot_x64': [
-      'gyp', 'clang', 'openh264_debug_bot', 'x64',
+    'win_gn_clang_debug_bot_x64': [
+      'gn', 'clang', 'openh264_debug_bot', 'x64',
     ],
-    'win_gyp_clang_release_bot_x64': [
-      'gyp', 'clang', 'openh264_release_bot', 'x64',
+    'win_gn_clang_release_bot_x64': [
+      'gn', 'clang', 'openh264_release_bot', 'x64',
     ],
-    'win_gyp_syzyasan_release_bot_x86': [
-      'gyp', 'syzyasan', 'minimal_symbols', 'openh264_release_bot', 'x86',
+    'win_gn_syzyasan_release_bot_x86': [
+      'gn', 'syzyasan', 'minimal_symbols', 'openh264_release_bot', 'x86',
     ],
     # TODO(kjellander): Flip DrMemory bots over to Release after GN migration
     # (http://crbug.com/636414).
-    'win_gyp_drmemory_debug_bot_x86': [
-      'gyp', 'drmemory', 'minimal_symbols', 'openh264_debug_bot', 'x86',
+    'win_gn_drmemory_debug_bot_x86': [
+      'gn', 'drmemory', 'minimal_symbols', 'openh264_debug_bot', 'x86',
     ],
 
     # Mac
     'mac_gn_asan_clang_release_bot_x64': [
       'gn', 'asan', 'clang', 'openh264_release_bot', 'x64',
     ],
 
     # Android
     'android_gyp_debug_static_bot_arm': [
       'android', 'gyp', 'debug_static_bot', 'arm', 'exclude_tests',
@@ skipping 226 matching lines @@
       'gn_args': 'target_cpu="x64"',
       'gyp_defines': 'target_arch=x64',
     },
 
     'x86': {
       'gn_args': 'target_cpu="x86"',
       'gyp_defines': 'target_arch=ia32',
     },
   },
 }