Flip LKGR/ClusterFuzz, WebKit MSAN bots back to GYP

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 316 matching lines @@
       'ASan Debug (32-bit x86 with V8-ARM)':
         'gn_asan_edge_fuzzer_v8_heap_debug_bot_hybrid',
       'ASan Release (32-bit x86 with V8-ARM)':
         'gn_asan_edge_fuzzer_v8_heap_release_bot_hybrid',
       'ASan Release (32-bit x86 with V8-ARM, symbolized)':
         'gn_asan_edge_fuzzer_v8_heap_symbolized_release_bot_hybrid',
       'ASan Release Media (32-bit x86 with V8-ARM)':
         'gn_asan_edge_fuzzer_v8_heap_chromeos_codecs_release_bot_hybrid',
       'ChromiumOS ASAN Release':
         'gyp_chromeos_asan_lsan_edge_fuzzer_v8_heap_release_bot',
-      'MSAN Release (chained origins)': 'gn_msan_edge_release_bot',
-      'MSAN Release (no origins)': 'gn_msan_no_origins_edge_release_bot',
+      'MSAN Release (chained origins)': 'gyp_msan_edge_release_bot',
+      'MSAN Release (no origins)': 'gyp_msan_no_origins_edge_release_bot',
       'Mac ASAN Debug': 'gyp_asan_fuzzer_v8_heap_debug_symbols_static_bot',
       'Mac ASAN Release Media':
         'gyp_asan_fuzzer_v8_heap_chrome_with_codecs_release_bot',
       'Mac ASAN Release': 'gyp_asan_fuzzer_v8_heap_release_bot',
       'TSAN Debug': 'gn_tsan_disable_nacl_line_tables_debug_bot',
       'TSAN Release': 'gn_tsan_disable_nacl_line_tables_release_bot',
       'Telemetry Harness Upload': 'none',
       'UBSan Release': 'gn_ubsan_release_bot',
       'UBSan vptr Release': 'gn_ubsan_vptr_edge_release_bot',
       'Win ASan Release Coverage':
@@ skipping 196 matching lines @@
       '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 MSAN': 'swarming_gyp_msan_release_bot',
       'WebKit Linux Trusty': 'swarming_gn_release_bot',
       'WebKit Linux': 'swarming_gn_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_gn_release_bot',
       'WebKit Mac10.11': 'none',
       'WebKit Mac10.9': 'swarming_gn_release_bot',
       'WebKit Win Builder (dbg)': 'swarming_gn_debug_bot_minimal_symbols_x86',
@@ skipping 736 matching lines @@
     ],
 
     'gyp_drmemory_shared_release_x86': [
       'gyp', 'drmemory', 'shared', 'release', 'x86',
     ],
 
     'gyp_drmemory_shared_release_x64': [
       'gyp', 'drmemory', 'shared', 'release', 'x64',
     ],
 
-    'gn_msan_edge_release_bot': [
-      'gn', 'msan', 'edge', 'release_bot',
+    'gyp_msan_edge_release_bot': [
+      'gyp', 'msan', 'edge', 'release_bot',
     ],
 
-    'gn_msan_no_origins_edge_release_bot': [
-      'gn', 'msan_no_origins', 'edge', 'release_bot',
+    'gyp_msan_no_origins_edge_release_bot': [
+      'gyp', 'msan_no_origins', 'edge', 'release_bot',
     ],
 
     'gyp_official': [
       'gyp', 'official',
     ],
 
     'gyp_official_goma': [
       'gyp', 'official', 'goma',
     ],
 
@@ skipping 244 matching lines @@
     ],
 
     'swarming_gn_debug_trybot': [
       'swarming', 'gn', 'debug_trybot',
     ],
 
     'swarming_gn_debug_trybot_x86': [
       'swarming', 'gn', 'debug_trybot', 'x86',
     ],
 
-    'swarming_gn_msan_release_bot': [
-      'swarming', 'gn', 'msan', 'release_bot',
+    'swarming_gyp_msan_release_bot': [
+      'swarming', 'gyp', 'msan', 'release_bot',
     ],
 
     'swarming_gn_release_bot': [
       'swarming', 'gn', 'release_bot',
     ],
 
     'swarming_gn_release_bot_arm': [
       'swarming', 'gn', 'release_bot', 'arm', 'crosscompile',
     ],
 
@@ skipping 242 matching lines @@
     ],
 
     'swarming_gyp_debug_bot': [
       'swarming', 'gyp', 'debug_bot',
     ],
 
     'swarming_gyp_debug_trybot': [
       'swarming', 'gyp', 'debug_trybot',
     ],
 
-    'swarming_gyp_msan_release_bot': [
-      'swarming', 'gyp', 'msan', 'release_bot',
-    ],
-
     '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 458 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',
     },
   },
 }