MB: Cleanup no-longer-used GN configurations

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_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',
       'Mac64 Debug (GYP)': 'gyp_debug_bot_x64_exclude_tests',
       'Mac64 Release (GYP)': 'gyp_release_bot_x64_exclude_tests',
 
       # Linux
       'Linux32 ARM': 'gn_crosscompile_release_bot_arm',
       'Linux64 Debug': 'gn_debug_bot_x64',
       'Linux64 Release': 'gn_release_bot_x64',
       'Linux Asan': 'gn_asan_lsan_clang_release_bot_x64',
       'Linux Memcheck': 'gn_memcheck_release_bot_x64',
       'Linux MSan': 'gn_msan_clang_release_bot_x64',
       'Linux Tsan v2': 'gn_tsan_clang_release_bot_x64',
       'Linux UBSan': 'gn_ubsan_clang_release_bot_x64',
       'Linux UBSan vptr': 'gn_ubsan_vptr_clang_release_bot_x64',
       'Linux64 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).
-      'Linux64 Debug (GN)': 'gyp_debug_bot_x64_exclude_tests',
-      'Linux64 Release (GN)': 'gyp_release_bot_x64_exclude_tests',
       'Linux64 Debug (GYP)': 'gyp_debug_bot_x64_exclude_tests',
       'Linux64 Release (GYP)': 'gyp_release_bot_x64_exclude_tests',
 
       # Android
       'Android32 Builder': 'android_gn_release_bot_arm',
       'Android32 Builder (dbg)': 'android_gn_debug_static_bot_arm',
       'Android32 Builder x86': 'android_gn_release_bot_x86',
       'Android32 Builder x86 (dbg)': 'android_gn_debug_static_bot_x86',
       'Android32 Builder MIPS (dbg)': 'android_gn_clang_debug_static_bot_mipsel',
       'Android32 Clang (dbg)': 'android_gn_clang_debug_static_bot_arm',
       'Android64 Builder': 'android_gn_release_bot_arm64',
       'Android64 Builder (dbg)': 'android_gn_debug_static_bot_arm64',
       'Android64 Builder x64 (dbg)': 'android_gn_debug_static_bot_x64',
-      # TODO(kjellander): Remove the 'Android32 GN' configs as soon we've
-      # renamed these bots to Android32 GYP in the main waterfall.
-      'Android32 GN': 'android_gyp_release_bot_arm',
-      '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': '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_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
-      # the bots to the GYP versions (duplicated now).
-      'mac_gn_dbg': 'gyp_debug_bot_x64_exclude_tests',
-      'mac_gn_rel': 'gyp_release_bot_x64_exclude_tests',
       'mac_gyp_dbg': 'gyp_debug_bot_x64_exclude_tests',
       'mac_gyp_rel': 'gyp_release_bot_x64_exclude_tests',
 
       # Linux
       'linux_compile_dbg': 'gn_debug_bot_x64',
       'linux_compile_rel': 'gn_release_bot_x64',
       'linux_dbg': 'gn_debug_bot_x64',
       'linux_rel': 'gn_release_bot_x64',
       'linux32_dbg': 'gn_debug_bot_x86',
       'linux32_rel': 'gn_release_bot_x86',
       'linux_arm': 'gn_crosscompile_release_bot_arm',
       'linux_asan': 'gn_asan_lsan_clang_release_bot_x64',
       'linux_memcheck': 'gn_memcheck_release_bot_x64',
       'linux_msan': 'gn_msan_clang_release_bot_x64',
       'linux_tsan2': 'gn_tsan_clang_release_bot_x64',
       'linux_ubsan': 'gn_ubsan_clang_release_bot_x64',
       'linux_ubsan_vptr': 'gn_ubsan_vptr_clang_release_bot_x64',
       'linux_baremetal': 'gn_release_bot_x64',
       'linux_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).
-      'linux_gn_dbg': 'gyp_debug_bot_x64_exclude_tests',
-      'linux_gn_rel': 'gyp_release_bot_x64_exclude_tests',
       'linux_gyp_dbg': 'gyp_debug_bot_x64_exclude_tests',
       'linux_gyp_rel': 'gyp_release_bot_x64_exclude_tests',
 
       # Android
       'android_compile_dbg': 'android_gn_debug_static_bot_arm',
       'android_compile_rel': 'android_gn_release_bot_arm',
       'android_compile_arm64_dbg': 'android_gn_debug_static_bot_arm64',
       'android_compile_arm64_rel': 'android_gn_release_bot_arm64',
       'android_compile_x86_dbg': 'android_gn_debug_static_bot_x86',
       'android_compile_x86_rel': 'android_gn_release_bot_x86',
       'android_compile_x64_dbg': 'android_gn_debug_static_bot_x64',
       'android_compile_mips_dbg': 'android_gn_clang_debug_static_bot_mipsel',
       'android_dbg': 'android_gn_debug_static_bot_arm',
       'android_rel': 'android_gn_release_bot_arm',
       'android_clang_dbg': 'android_gn_clang_debug_static_bot_arm',
       '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': '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',
     },
     'client.webrtc.fyi': {
       # Mac
       'Mac64 Release (swarming)': 'swarming_gn_release_bot_x64',
 
       # Linux
       'Linux32 Debug': 'gn_debug_bot_x86',
       'Linux32 Release': 'gn_release_bot_x86',
@@ skipping 357 matching lines @@
       'gn_args': 'target_cpu="x64"',
       'gyp_defines': 'target_arch=x64',
     },
 
     'x86': {
       'gn_args': 'target_cpu="x86"',
       'gyp_defines': 'target_arch=ia32',
     },
   },
 }