MB: Flip iOS 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
 # configurations source-side instead of in the buildbot scripts. That makes it
 # easy to try different configurations of GYP and GN in tryjob patches.
 
 {
   # This is a map of buildbot master names -> buildbot builder names ->
   # config names (where each config name is a key in the 'configs' dict,
   # above). mb uses this dict to look up which config to use for a given bot.
   # The builders should be sorted by the order they appear in the /builders
   # page on the buildbots, *not* alphabetically.
   'masters': {
     'client.webrtc': {
       # iOS
-      'iOS32 Debug': 'ios_gyp_debug_static_bot_arm_device',
-      'iOS32 Release': 'ios_gyp_release_bot_arm_device',
-      'iOS64 Debug': 'ios_gyp_debug_static_bot_arm64_device',
-      'iOS64 Release': 'ios_gyp_release_bot_arm64_device',
-      'iOS32 Simulator Debug': 'ios_gyp_debug_static_bot_x86',
-      'iOS64 Simulator Debug': 'ios_gyp_debug_static_bot_x64',
-      'iOS64 Debug (GN)': 'ios_gn_debug_static_bot_arm64_device',
-      'iOS64 Release (GN)': 'ios_gn_release_bot_arm64_device',
+      'iOS32 Debug': 'ios_gn_debug_static_bot_arm_device',
+      'iOS32 Release': 'ios_gn_release_bot_arm_device',
+      'iOS64 Debug': 'ios_gn_debug_static_bot_arm64_device',
+      'iOS64 Release': 'ios_gn_release_bot_arm64_device',
+      'iOS32 Simulator Debug': 'ios_gn_debug_static_bot_x86',
+      'iOS64 Simulator Debug': 'ios_gn_debug_static_bot_x64',
+      # TODO(kjellander): Remove the two GN configs below as soon we've renamed
+      # the bots to the GYP versions (duplicated now).
+      'iOS64 Debug (GN)': 'ios_gyp_debug_static_bot_arm64_device',
+      'iOS64 Release (GN)': 'ios_gyp_release_bot_arm64_device',
+      'iOS64 Debug (GYP)': 'ios_gyp_debug_static_bot_arm64_device',
+      'iOS64 Release (GYP)': 'ios_gyp_release_bot_arm64_device',
 
       # Mac
       'Mac64 Debug': 'gn_debug_bot_x64',
       'Mac64 Release': 'gn_release_bot_x64',
       'Mac Asan': 'mac_gn_asan_clang_release_bot_x64',
       'Mac64 Release [large tests]': 'gn_release_bot_x64',
       # TODO(kjellander): Remove the two GN configs below as soon we've renamed
       # the bots to the GYP versions (duplicated now).
       'Mac64 Debug (GN)': 'gyp_debug_bot_x64_exclude_tests',
       'Mac64 Release (GN)': 'gyp_release_bot_x64_exclude_tests',
@@ skipping 55 matching lines @@
       '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',
-      'ios64_gn_rel': 'ios_gn_release_bot_arm64_device',
+      'ios_dbg': 'ios_gn_debug_static_bot_arm_device',
+      'ios_rel': 'ios_gn_release_bot_arm_device',
+      'ios_arm64_dbg': 'ios_gn_debug_static_bot_arm64_device',
+      'ios_arm64_rel': 'ios_gn_release_bot_arm64_device',
+      'ios32_sim_dbg': 'ios_gn_debug_static_bot_x86',
+      'ios64_sim_dbg': 'ios_gn_debug_static_bot_x64',
+      # TODO(kjellander): Remove the two GN configs below as soon we've renamed
+      # the bots to the GYP versions (duplicated now).
+      'ios64_gn_dbg': 'ios_gyp_debug_static_bot_arm64_device',
+      'ios64_gn_rel': 'ios_gyp_release_bot_arm64_device',
+      'ios64_gyp_dbg': 'ios_gyp_debug_static_bot_arm64_device',
+      'ios64_gyp_rel': 'ios_gyp_release_bot_arm64_device',
 
       # Mac
       'mac_compile_dbg': 'gn_debug_bot_x64',
       'mac_compile_rel': 'gn_release_bot_x64',
       'mac_dbg': 'gn_debug_bot_x64',
       'mac_rel': 'gn_release_bot_x64',
       'mac_asan': 'mac_gn_asan_clang_release_bot_x64',
       'mac_baremetal': 'gn_release_bot_x64',
       'mac_swarming': 'swarming_gn_debug_bot_x64',
       # TODO(kjellander): Remove the two GN configs below as soon we've renamed
@@ skipping 78 matching lines @@
   # is not necessarily so (i.e., we might have mac, win, and linux
   # bots all using the 'gn_release_bot' config).
   'configs': {
     # iOS
     'ios_gn_debug_static_bot_arm64_device': [
       'ios', 'gn', 'debug_static_bot', 'arm64', 'device'
     ],
     'ios_gn_release_bot_arm64_device': [
       'ios', 'gn', 'release_bot', 'arm64', 'device'
     ],
-    'ios_gyp_debug_static_bot_arm_device': [
-      'ios', 'gyp', 'debug_static_bot', 'arm', 'device'
+    'ios_gn_debug_static_bot_arm_device': [
+      'ios', 'gn', 'debug_static_bot', 'arm', 'device'
     ],
-    'ios_gyp_release_bot_arm_device': [
-      'ios', 'gyp', 'release_bot', 'arm', 'device'
+    'ios_gn_release_bot_arm_device': [
+      'ios', 'gn', 'release_bot', 'arm', 'device'
+    ],
+    'ios_gn_debug_static_bot_x86': [
+      'ios', 'gn', 'debug_static_bot', 'x86'
+    ],
+    'ios_gn_debug_static_bot_x64': [
+      'ios', 'gn', 'debug_static_bot', 'x64'
     ],
     'ios_gyp_debug_static_bot_arm64_device': [
       'ios', 'gyp', 'debug_static_bot', 'arm64', 'device'
     ],
     'ios_gyp_release_bot_arm64_device': [
       'ios', 'gyp', 'release_bot', 'arm64', 'device'
     ],
-    'ios_gyp_debug_static_bot_x86': [
-      '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_x64_exclude_tests': [
       'gyp', 'openh264_debug_bot', 'x64', 'exclude_tests', 'exclude_examples'
     ],
     'gyp_release_bot_x64_exclude_tests': [
       'gyp', 'openh264_release_bot', 'x64', 'exclude_tests', 'exclude_examples'
@@ skipping 291 matching lines @@
       'gn_args': 'target_cpu="x64"',
       'gyp_defines': 'target_arch=x64',
     },
 
     'x86': {
       'gn_args': 'target_cpu="x86"',
       'gyp_defines': 'target_arch=ia32',
     },
   },
 }