Index: tools/mb/mb_config.pyl |
diff --git a/tools/mb/mb_config.pyl b/tools/mb/mb_config.pyl |
index b660074a928245dd492e9047c0c3ff7bb38cefa0..939b1e2401587296abe7b49b61c9938277327515 100644 |
--- a/tools/mb/mb_config.pyl |
+++ b/tools/mb/mb_config.pyl |
@@ -38,10 +38,15 @@ |
'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_release_bot': ['gyp', 'release_bot'], |
'gyp_release_bot_arm': ['gyp', 'release_bot', 'arm'], |
'gyp_release_trybot': ['gyp', 'release_trybot'], |
- 'swarming_gyp_debug_bot': ['swarming', 'gyp', 'debug_bot'], |
+ |
+ # The swarming mixin has no effect on GN, so 'swarming_gn_debug_bot' |
+ # is the same as 'gn_debug_bot', but we keep these configs listed for |
+ # symmetry w/ the gyp configs. |
+ 'swarming_gn_debug_bot': ['swarming', 'gn', 'debug_bot'], |
+ 'swarming_gn_release_bot': ['swarming', 'gn', 'release_bot'], |
+ |
'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'], |
@@ -229,12 +234,12 @@ |
'Linux ChromiumOS GN (dbg)': 'chromeos_gn_debug_bot', |
}, |
'chromium.linux': { |
- 'Linux Builder': 'swarming_gyp_release_bot', |
- 'Linux Tests': 'gyp_release_bot', |
+ 'Linux Builder': 'swarming_gn_release_bot', |
+ 'Linux Tests': 'swarming_gn_release_bot', |
'Linux Builder (dbg)(32)': 'gyp_debug_bot_no_symbols_x86', |
'Linux Tests (dbg)(1)(32)': 'gyp_debug_bot_no_symbols_x86', |
- 'Linux Builder (dbg)': 'swarming_gyp_debug_bot', |
- 'Linux Tests (dbg)(1)': 'swarming_gyp_debug_bot', |
+ 'Linux Builder (dbg)': 'swarming_gn_debug_bot', |
+ 'Linux Tests (dbg)(1)': 'swarming_gn_debug_bot', |
'Linux GN': 'gn_release_bot', |
'Linux GN Clobber': 'gn_release_bot', |
'Linux GN (dbg)': 'gn_debug_bot', |