Fix MB definitions for Linux Builder (dbg)(32), Linux Tests.

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 the list of configs that you can pass to mb; each config
   # represents a particular combination of GYP_DEFINES/gn args that
   # we must support. A given config *may* be platform-specific but
   # is not necessarily so (i.e., we might have mac, win, and linux
   # bots all using the 'gn_release_bot' config).
@@ skipping 21 matching lines @@
     'gn_debug_bot': ['gn', 'debug_bot'],
     'gn_debug_bot_minimal_symbols': ['gn', 'debug_bot_minimal_symbols'],
     'gn_debug_bot_minimal_symbols_x86': ['gn', 'debug_bot_minimal_symbols', 'x86'],
     'gn_debug_static_bot': ['gn', 'debug_static_bot'],
     'gn_linux_upload': ['gn_linux_upload'],
     'gn_release_bot': ['gn', 'release_bot'],
     'gn_release_bot_minimal_symbols': ['gn', 'release_bot_minimal_symbols'],
     'gn_release_bot_minimal_symbols_x86': ['gn', 'release_bot_minimal_symbols', 'x86'],
     'gn_release_trybot': ['gn', 'release_trybot'],
     'gn_release_trybot_x86': ['gn', 'release_trybot', 'x86'],
-    'gyp_debug_bot_no_symbols_x86': ['gyp', 'debug_bot', 'no_symbols', 'x86'],
     'gyp_debug_bot': ['gyp', 'debug_bot'],
     'gyp_debug_bot_x86': ['gyp', 'debug_bot', 'x86'],
-    'gyp_release_bot': ['gyp', 'release_bot'],
     'gyp_release_bot_arm': ['gyp', 'release_bot', 'arm'],
     'gyp_release_trybot': ['gyp', 'release_trybot'],
 
     # This is just for completeness; any bot that uses this config should never actually run MB.
     'none': ['none'],
 
     'swarming_asan_lsan_gyp_release_trybot': ['swarming', 'asan', 'lsan', 'release_trybot'],
     'swarming_msan_gyp_release_trybot': ['swarming', 'chromeos', 'msan', 'gyp', 'release_trybot'],
     'swarming_deterministic_gyp_release_bot': ['swarming', 'deterministic', 'gyp', 'release_bot'],
     'swarming_gpu_tests_gyp_release_trybot': ['swarming', 'gpu_tests', 'gyp', 'release_trybot'],
     'swarming_gyp_debug_bot': ['swarming', 'gyp', 'debug_bot'],
+    'swarming_gyp_debug_bot_no_symbols_x86': ['swarming', 'gyp', 'debug_bot', 'no_symbols', 'x86'],
     'swarming_gyp_debug_trybot': ['swarming', 'gyp', 'debug_trybot'],
     'swarming_gyp_debug_trybot_x86': ['swarming', 'gyp', 'debug_trybot', 'x86'],
     'swarming_gyp_release_bot': ['swarming', 'gyp', 'release_bot'],
     'swarming_gyp_release_trybot': ['swarming', 'gyp', 'release_trybot'],
     'swarming_gyp_release_trybot_arm': ['swarming', 'gyp', 'release_trybot', 'arm'],
     'swarming_gyp_release_trybot_arm_float': ['swarming', 'gyp', 'release_trybot', 'arm_float'],
     'swarming_tsan_gyp_release_trybot': ['swarming', 'disable_nacl', 'tsan', 'gyp', 'release_trybot'],
 
     # clang/win doesn't work with goma yet, so this can't use debug_bot:
     'win_clang_debug_bot': ['gn', 'clang', 'debug', 'shared', 'minimal_symbols'],
@@ skipping 214 matching lines @@
   # page on the buildbots, *not* alphabetically.
   #
   # TODO(crbug.com/481692): Add in remaining bots on the waterfalls.
   'masters': {
     'chromium.chromiumos': {
       'Linux ChromiumOS GN': 'chromeos_gn_release_bot',
       'Linux ChromiumOS GN (dbg)': 'chromeos_gn_debug_bot',
     },
     'chromium.linux': {
       'Linux Builder': 'swarming_gyp_release_bot',
-      'Linux Tests': 'gyp_release_bot',
-      'Linux Builder (dbg)(32)': 'gyp_debug_bot_no_symbols_x86',
-      'Linux Tests (dbg)(1)(32)': 'gyp_debug_bot_no_symbols_x86',
+      'Linux Tests': 'swarming_gyp_release_bot',
+      'Linux Builder (dbg)(32)': 'swarming_gyp_debug_bot_no_symbols_x86',
+      'Linux Tests (dbg)(1)(32)': 'swarming_gyp_debug_bot_no_symbols_x86',
       'Linux Builder (dbg)': 'swarming_gyp_debug_bot',
       'Linux Tests (dbg)(1)': 'swarming_gyp_debug_bot',
       'Linux GN': 'gn_release_bot',
       'Linux GN Clobber': 'gn_release_bot',
       'Linux GN (dbg)': 'gn_debug_bot',
       'Linux ARM': 'gyp_release_bot_arm',
       'Cast Linux': 'cast_gyp_release_bot',
       'Android Arm64 Builder (dbg)': 'android_gyp_debug_static_bot_arm64',
       'Android Builder (dbg)': 'android_gyp_debug_static_bot',
       'Android Tests (dbg)': 'android_gyp_debug_static_bot',
@@ skipping 94 matching lines @@
       'win8_chromium_gn_rel': 'gn_release_trybot_x86',
       'win8_chromium_gn_upload': 'gn_release_bot_minimal_symbols',
       'win_clang_x64_dbg': 'win_clang_debug_bot',
     },
     'tryserver.v8': {
       'v8_linux_chromium_gn_rel': 'gn_release_trybot',
       'v8_android_chromium_gn_dbg': 'android_gn_debug_bot',
     },
   },
 }