Revert of [gn] Switch linux64 debug and internal snapshot to gn

infra/mb/mb_config.pyl

 # Copyright 2016 The V8 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.
 
 {
   # 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.
   # Bots are ordered by appearance on waterfall.
   'masters': {
     'client.dart.fyi': {
       'v8-linux-release': 'gyp_release_x86_disassembler',
       'v8-win-release': 'gyp_release_x86_disassembler',
       'v8-mac-release': 'gyp_release_x86_disassembler',
     },
     'client.dynamorio': {
       'linux-v8-dr': 'gyp_release_x64',
     },
     'client.v8': {
       # Linux.
       'V8 Linux - builder': 'gyp_release_x86_gcmole',
       'V8 Linux - debug builder': 'gyp_debug_x86',
       'V8 Linux - nosnap builder': 'gyp_release_x86_no_snap',
       'V8 Linux - nosnap debug builder': 'gyp_debug_x86_no_snap',
       'V8 Linux - shared': 'gyp_release_x86_shared_verify_heap',
       'V8 Linux - noi18n - debug': 'gyp_debug_x86_no_i18n',
       # Linux64.
       'V8 Linux64 - builder': 'gn_release_x64',
-      'V8 Linux64 - debug builder': 'gn_debug_x64_valgrind',
+      'V8 Linux64 - debug builder': 'gyp_debug_x64_valgrind',
       'V8 Linux64 - custom snapshot - debug builder': 'gyp_debug_x64_custom',
-      'V8 Linux64 - internal snapshot': 'gn_release_x64_internal',
+      'V8 Linux64 - internal snapshot': 'gyp_release_x64_internal',
       # Windows.
       'V8 Win32 - builder': 'gyp_release_x86_minimal_symbols',
       'V8 Win32 - debug builder': 'gyp_debug_x86_minimal_symbols',
       'V8 Win32 - nosnap - shared':
         'gyp_release_x86_no_snap_shared_minimal_symbols',
       'V8 Win64': 'gyp_release_x64_minimal_symbols',
       'V8 Win64 - debug': 'gyp_debug_x64_minimal_symbols',
       'V8 Win64 - clang': 'gyp_release_x64_clang',
       # Mac.
       'V8 Mac': 'gyp_release_x86',
@@ skipping 92 matching lines @@
       'v8_linux_nodcheck_rel_ng': 'gyp_release_x86_minimal_symbols',
       'v8_linux_dbg_ng': 'gyp_debug_x86_trybot',
       'v8_linux_noi18n_rel_ng': 'gyp_release_x86_no_i18n_trybot',
       'v8_linux_gc_stress_dbg': 'gyp_debug_x86_trybot',
       'v8_linux_nosnap_rel': 'gyp_release_x86_no_snap_trybot',
       'v8_linux_nosnap_dbg': 'gyp_debug_x86_no_snap_trybot',
       'v8_linux_gcc_compile_rel': 'gyp_release_x86_gcc_minimal_symbols',
       'v8_linux_gcc_rel': 'gyp_release_x86_gcc_minimal_symbols',
       'v8_linux64_rel_ng': 'gn_release_x64_trybot',
       'v8_linux64_avx2_rel_ng': 'gn_release_x64_trybot',
-      'v8_linux64_avx2_dbg': 'gn_debug_x64_trybot',
+      'v8_linux64_avx2_dbg': 'gyp_debug_x64_trybot',
       'v8_linux64_asan_rel_ng': 'gyp_release_x64_asan_minimal_symbols',
       'v8_linux64_msan_rel': 'gyp_release_simulate_arm64_msan_minimal_symbols',
       'v8_linux64_sanitizer_coverage_rel':
           'gyp_release_x64_asan_minimal_symbols_coverage',
       'v8_linux64_tsan_rel': 'gyp_release_x64_tsan_minimal_symbols',
       'v8_win_dbg': 'gyp_debug_x86_trybot',
       'v8_win_compile_dbg': 'gyp_debug_x86_trybot',
       'v8_win_rel_ng': 'gyp_release_x86_trybot',
       'v8_win_nosnap_shared_rel_ng':
         'gyp_release_x86_no_snap_shared_minimal_symbols',
@@ skipping 18 matching lines @@
     },
   },
 
 
   # To ease readability, config values are ordered by:
   # gyp/gn, release/debug, arch type, other values alphabetically.
   'configs': {
     # GN release configs for x64.
     'gn_release_x64': [
       'gn', 'release_bot', 'x64', 'swarming'],
-    'gn_release_x64_internal': [
-      'gn', 'release_bot', 'x64', 'swarming', 'v8_snapshot_internal'],
     'gn_release_x64_trybot': [
       'gn', 'release_trybot', 'x64', 'swarming'],
 
-    # GN debug configs for x64.
-    'gn_debug_x64_trybot': [
-      'gn', 'debug_trybot', 'x64', 'swarming'],
-    'gn_debug_x64_valgrind': [
-      'gn', 'debug_bot', 'x64', 'swarming', 'valgrind'],
-
     # Gyp debug configs for arm.
     'gyp_debug_arm': [
       'gyp', 'debug_bot', 'arm', 'crosscompile', 'hard_float', 'swarming'],
 
     # Gyp debug configs for simulators.
     'gyp_debug_simulate_arm': [
       'gyp', 'debug_bot', 'simulate_arm', 'swarming'],
     'gyp_debug_simulate_arm_asan_edge': [
       'gyp', 'debug_bot', 'simulate_arm', 'asan', 'edge'],
     'gyp_debug_simulate_arm64': [
       'gyp', 'debug_bot', 'simulate_arm64', 'swarming'],
     'gyp_debug_simulate_arm64_asan_edge': [
       'gyp', 'debug_bot', 'simulate_arm64', 'asan', 'lsan', 'edge'],
     'gyp_debug_simulate_arm64_no_snap': [
       'gyp', 'debug_bot', 'simulate_arm64', 'swarming', 'v8_snapshot_none'],
     'gyp_debug_simulate_mipsel_asan_edge': [
       'gyp', 'debug_bot', 'simulate_mipsel', 'asan', 'edge'],
     'gyp_debug_simulate_x87_no_snap': [
       'gyp', 'debug_bot', 'simulate_x87', 'v8_snapshot_none'],
 
     # Gyp debug configs for x64.
     'gyp_debug_x64': [
       'gyp', 'debug_bot', 'x64', 'swarming'],
     'gyp_debug_x64_asan_edge': [
       'gyp', 'debug_bot', 'x64', 'asan', 'lsan', 'edge'],
     'gyp_debug_x64_custom': [
       'gyp', 'debug_bot', 'x64', 'swarming', 'v8_snapshot_custom'],
     'gyp_debug_x64_minimal_symbols': [
       'gyp', 'debug_bot', 'x64', 'minimal_symbols', 'swarming'],
+    'gyp_debug_x64_trybot': [
+      'gyp', 'debug_trybot', 'x64', 'swarming'],
+    'gyp_debug_x64_valgrind': [
+      'gyp', 'debug_bot', 'x64', 'swarming', 'valgrind'],
 
     # Gyp debug configs for x86.
     'gyp_debug_x86': [
       'gyp', 'debug_bot', 'x86', 'swarming'],
     'gyp_debug_x86_minimal_symbols': [
       'gyp', 'debug_bot', 'x86', 'minimal_symbols', 'swarming'],
     'gyp_debug_x86_trybot': [
       'gyp', 'debug_trybot', 'x86', 'swarming'],
     'gyp_debug_x86_no_i18n': [
       'gyp', 'debug_bot', 'x86', 'v8_no_i18n'],
@@ skipping 66 matching lines @@
     'gyp_release_x64_clang': [
       'gyp', 'release_bot', 'x64', 'clang', 'swarming'],
     'gyp_release_x64_gcc_coverage': [
       'gyp', 'release_bot', 'x64', 'coverage', 'gcc'],
     'gyp_release_x64_minimal_symbols': [
       'gyp', 'release_bot', 'x64', 'minimal_symbols', 'swarming'],
     'gyp_release_x64_tsan': [
       'gyp', 'release_bot', 'x64', 'tsan', 'swarming'],
     'gyp_release_x64_tsan_minimal_symbols': [
       'gyp', 'release_bot', 'x64', 'tsan', 'minimal_symbols', 'swarming'],
+    'gyp_release_x64_internal': [
+      'gyp', 'release_bot', 'x64', 'swarming', 'v8_snapshot_internal'],
     'gyp_release_x64_trybot': [
       'gyp', 'release_trybot', 'x64', 'swarming'],
 
     # Gyp release configs for x86.
     'gyp_release_x86': [
       'gyp', 'release_bot', 'x86', 'swarming'],
     'gyp_release_x86_disassembler': [
       'gyp', 'release_bot', 'x86', 'v8_enable_disassembler'],
     'gyp_release_x86_gcc': [
       'gyp', 'release_bot', 'x86', 'gcc'],
@@ skipping 295 matching lines @@
       'gn_args': 'target_cpu="x64"',
       'gyp_defines': 'target_arch=x64',
     },
 
     'x86': {
       'gn_args': 'target_cpu="x86"',
       'gyp_defines': 'target_arch=ia32',
     },
   },
 }