From 0a34fa65a3dc5b2bd1411273fab40cb34216f993 Mon Sep 17 00:00:00 2001 From: dpranke Date: Mon, 10 Aug 2015 09:51:38 -0700 Subject: [PATCH] Add configs that depend on linux builder and linux builder (dbg). This patch adds MB configs for the bots that try to match 'Linux Builder' and 'Linux Builder (dbg)' on chromium.linux. This also fixes the Linux Builder definition to make sure swarming is enabled. R=phajdan.jr@chromium.org BUG=481692 Review URL: https://codereview.chromium.org/1273943005 Cr-Commit-Position: refs/heads/master@{#342635} --- tools/mb/mb_config.pyl | 36 +++++++++++++++++++++++++++++++----- 1 file changed, 31 insertions(+), 5 deletions(-) diff --git a/tools/mb/mb_config.pyl b/tools/mb/mb_config.pyl index c3ca93a613e3..4386f9d09c09 100644 --- a/tools/mb/mb_config.pyl +++ b/tools/mb/mb_config.pyl @@ -39,6 +39,13 @@ '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'], + 'swarming_gyp_debug_bot_x86': ['swarming', 'gyp', 'debug_bot', 'x86'], + 'swarming_gyp_release_bot': ['swarming', 'gyp', 'release_bot'], + 'swarming_gyp_release_trybot': ['swarming', 'gyp', 'release_trybot'], + 'swarming_gpu_tests_gyp_release_trybot': ['swarming', 'gpu_tests', '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'], }, @@ -177,6 +184,11 @@ 'gyp_defines': 'component=static_library', }, + 'swarming': { + 'gn_args': '', + 'gyp_defines': 'test_isolation_mode=prepare', + }, + 'x86': { 'gn_args': 'target_cpu="x86"', 'gyp_args': 'target_arch=ia32', @@ -196,7 +208,7 @@ 'Linux ChromiumOS GN (dbg)': 'chromeos_gn_debug_bot', }, 'chromium.linux': { - 'Linux Builder': 'gyp_release_bot', + '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', @@ -247,6 +259,12 @@ 'Win GN': 'gn_release_bot_x86', 'Win GN (dbg)': 'gn_debug_bot_x86', }, + 'client.skia': { + 'Linux Builder': 'swarming_gyp_release_bot', + 'Linux Builder-Trybot': 'swarming_gyp_release_bot', + 'Linux Tests': 'swarming_gyp_release_bot', + }, + 'client.v8.fyi': { 'V8 Linux GN': 'gn_release_bot', 'V8 Android GN (dbg)': 'android_gn_debug_bot', @@ -258,12 +276,20 @@ 'linux_chromium_gn_rel': 'gn_release_bot', }, 'tryserver.chromium.linux': { - 'android_chromium_gn_compile_dbg': 'android_gn_debug_bot', - 'android_chromium_gn_compile_rel': 'android_gn_release_trybot', + 'linux_full_bisect_builder': 'swarming_gyp_release_bot', + 'linux_chromium_compile_rel_ng': 'swarming_gyp_release_trybot', + 'linux_chromium_rel_ng': 'swarming_gpu_tests_gyp_release_trybot', + 'linux_chromium_gn_rel': 'gn_release_trybot', 'linux_chromium_gn_chromeos_rel': 'chromeos_gn_release_trybot', - 'linux_chromium_gn_chromeos_dbg': 'chromeos_gn_debug_bot', + 'android_chromium_gn_compile_rel': 'android_gn_release_trybot', + 'linux_chromium_compile_dbg_ng': 'swarming_gyp_debug_bot', + 'linux_chromium_dbg_ng': 'swarming_gyp_debug_bot', 'linux_chromium_gn_dbg': 'gn_debug_bot', - 'linux_chromium_gn_rel': 'gn_release_trybot', + 'linux_chromium_gn_chromeos_dbg': 'chromeos_gn_debug_bot', + 'android_chromium_gn_compile_dbg': 'android_gn_debug_bot', + 'linux_chromium_compile_dbg_32_ng': 'swarming_gyp_debug_bot_x86', + 'linux_chromium_dbg_32_ng': 'swarming_gyp_debug_bot_x86', + 'linux_chromium_clobber_rel_ng': 'gyp_release_trybot', 'linux_chromium_gn_upload': 'gn_linux_upload', }, 'tryserver.chromium.mac': { -- 2.11.4.GIT