Flip Mac CQ bots and matching waterfall bots to GN.

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 208 matching lines @@
       'UBSanVptr Linux': 'gn_ubsan_vptr_release_bot',
       'WebKit Linux - WPTServe': 'swarming_gn_release_bot',
       'WebKit Linux - TraceWrappables': 'swarming_gn_release_bot_x64',
       'Win LKGR (DrM 64)': 'gn_release_drmemory_drfuzz',
       'Win LKGR (DrM)': 'gn_release_drmemory_drfuzz_x86',
       'Win 10 Fast Ring': 'gn_release_trybot_x64',
     },
 
     'chromium.gpu': {
       # These all use the 'trybot' mixins to ensure that dcheck is on.
-      'GPU Mac Builder': 'swarming_gpu_tests_gyp_release_trybot',
-      'GPU Mac Builder (dbg)': 'swarming_gpu_tests_gyp_debug_trybot',
+      'GPU Mac Builder': 'swarming_gpu_tests_gn_release_trybot',
+      'GPU Mac Builder (dbg)': 'swarming_gpu_tests_gn_debug_trybot',
       'GPU Linux Builder (dbg)': 'swarming_gpu_tests_gn_debug_trybot',
       'GPU Linux Builder': 'swarming_gpu_tests_gn_release_trybot',
       'GPU Win Builder': 'swarming_gpu_tests_gn_release_trybot_x86',
       'GPU Win Builder (dbg)': 'swarming_gpu_tests_gn_debug_trybot_x86',
       'Linux Debug (NVIDIA)': 'none',
       'Linux Release (NVIDIA)': 'none',
       'Mac 10.10 Debug (Intel)': 'none',
       'Mac 10.10 Release (Intel)': 'none',
       'Mac 10.10 Retina Debug (AMD)': 'none',
       'Mac 10.10 Retina Release (AMD)': 'none',
       'Win7 Debug (NVIDIA)': 'none',
       'Win7 Release (ATI)': 'none',
       'Win7 Release (NVIDIA)': 'none',
     },
 
     'chromium.gpu.fyi': {
       # These all use the 'trybot' mixins to ensure that dcheck is on.
       'Android Release (Nexus 5)': 'android_gn_release_trybot',
       'Android Release (Nexus 5X)': 'swarming_android_gn_release_trybot_arm64',
       'Android Release (Nexus 6)': 'android_gn_release_trybot',
       'Android Release (Nexus 6P)': 'android_gn_release_trybot_arm64',
       'Android Release (Nexus 9)': 'android_gn_release_trybot_arm64',
       'GPU Linux Builder (dbg)': 'swarming_gpu_fyi_tests_gn_debug_trybot',
       'GPU Linux Builder': 'swarming_gpu_fyi_tests_gn_release_trybot',
-      'GPU Mac Builder': 'swarming_gpu_fyi_tests_gyp_release_trybot',
-      'GPU Mac Builder (dbg)': 'swarming_gpu_fyi_tests_gyp_debug_trybot',
+      'GPU Mac Builder': 'swarming_gpu_fyi_tests_gn_release_trybot',
+      'GPU Mac Builder (dbg)': 'swarming_gpu_fyi_tests_gn_debug_trybot',
       'GPU Win Builder': 'swarming_gpu_tests_deqp_gles_gyp_release_trybot_x86',
       'GPU Win Builder (dbg)':
         'swarming_gpu_tests_deqp_gles_gyp_debug_trybot_x86',
       'GPU Win Clang Builder (dbg)':
         'swarming_gpu_fyi_tests_win_clang_debug_bot',
       'GPU Win x64 Builder':
         'swarming_gpu_tests_deqp_gles_gyp_release_trybot_x64',
       'GPU Win x64 Builder (dbg)':
         'swarming_gpu_tests_deqp_gles_gyp_debug_trybot_x64',
       'Linux ChromiumOS Builder':
@@ skipping 525 matching lines @@
     'tryserver.chromium.mac': {
       'ios-device': 'ios_gyp',
       'ios-device-gn': 'ios_gn',
       'ios-simulator': 'ios_gyp',
       'ios-simulator-gn': 'ios_gn',
       'mac_chromium_10.10_rel_ng': 'swarming_gpu_tests_gyp_release_trybot',
       'mac_chromium_10.10_macviews': 'mac_views_browser_gyp_release_trybot',
       'mac_chromium_archive_rel_ng': 'noswarming_gyp_release_trybot',
       'mac_chromium_asan_rel_ng': 'swarming_asan_dcheck_gyp_release_bot',
       'mac_chromium_asan_variable': 'findit',
-      'mac_chromium_compile_dbg_ng': 'swarming_gyp_debug_trybot',
-      'mac_chromium_compile_rel_ng': 'swarming_gpu_tests_gyp_release_trybot',
-      'mac_chromium_dbg_ng': 'swarming_gyp_debug_trybot',
+      'mac_chromium_compile_dbg_ng': 'swarming_gn_debug_trybot',
+      'mac_chromium_compile_rel_ng': 'swarming_gpu_tests_gn_release_trybot',
+      'mac_chromium_dbg_ng': 'swarming_gn_debug_trybot',
       'mac_chromium_gn_dbg': 'gn_debug_bot',
       'mac_chromium_gn_rel': 'gn_release_trybot',
       'mac_chromium_gn_upload': 'gn_release_bot',
-      'mac_chromium_rel_ng': 'swarming_gpu_tests_gyp_release_trybot',
+      'mac_chromium_rel_ng': 'swarming_gpu_tests_gn_release_trybot',
       'mac_chromium_variable': 'findit',
       'mac_chromium_variable_10.10': 'findit',
       'mac_chromium_variable_10.10_macviews': 'findit',
       'mac_chromium_variable_10.10_layout': 'findit',
       'mac_chromium_variable_10.11': 'findit',
       'mac_chromium_variable_10.11_layout': 'findit',
       'mac_chromium_variable_archive': 'findit',
       'mac_chromium_variable_chrome': 'findit',
       'mac_chromium_variable_gn': 'findit',
       'mac_chromium_variable_layout': 'findit',
@@ skipping 857 matching lines @@
     ],
 
     'swarming_gpu_tests_gn_release_trybot': [
       'swarming', 'gpu_tests', 'gn', 'release_trybot',
     ],
 
     'swarming_gpu_tests_gn_release_trybot_x86': [
       'swarming', 'gpu_tests', 'gn', 'release_trybot', 'x86',
     ],
 
-    'swarming_gpu_tests_gyp_debug_trybot': [
-      'swarming', 'gpu_tests', 'gyp', 'debug_trybot',
-    ],
-
     'swarming_gpu_tests_gyp_release_bot': [
       'swarming', 'gpu_tests', 'gyp', 'release_bot',
     ],
 
     'swarming_gpu_tests_gyp_release_bot_minimal_symbols_x86': [
       'swarming', 'gpu_tests', 'gyp', 'release_bot', 'minimal_symbols', 'x86',
     ],
 
     'swarming_gpu_tests_gyp_release_bot_x86': [
       'swarming', 'gpu_tests', 'gyp', 'release_bot',
@@ skipping 134 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_trybot': [
-      'swarming', 'gyp', 'debug_trybot',
-    ],
-
     'swarming_gn_release_trybot_arm': [
       'swarming', 'gn', 'release_trybot', 'arm', 'crosscompile',
     ],
 
     'swarming_gyp_syzyasan_release_trybot_x86': [
       'swarming', 'gyp', 'syzyasan', 'release_trybot', 'x86',
     ],
 
     'swarming_tsan_disable_nacl_gn_release_bot': [
       'swarming', 'tsan', 'disable_nacl', 'gn', 'release_bot',
@@ skipping 460 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',
     },
   },
 }