diff options
| author | sergeyberezin@chromium.org <sergeyberezin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-26 04:38:32 +0000 |
|---|---|---|
| committer | sergeyberezin@chromium.org <sergeyberezin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-26 04:38:32 +0000 |
| commit | 0bb112369aae2f1fcb34547f171d1c7ac80b5547 (patch) | |
| tree | 49a755a577a68be74760b2187d0fc0358f65b089 /PRESUBMIT.py | |
| parent | a1b1459610bc0e4c5a7d912f83d8ebf156ce7023 (diff) | |
| download | chromium_src-0bb112369aae2f1fcb34547f171d1c7ac80b5547.zip chromium_src-0bb112369aae2f1fcb34547f171d1c7ac80b5547.tar.gz chromium_src-0bb112369aae2f1fcb34547f171d1c7ac80b5547.tar.bz2 | |
Update masters after the tryserver split.
Also replace deprecated linux_chromium_rel with linux_chromium_rel_swarming, while I'm at it.
R=agable@chromium.org, maruel@chromium.org
BUG=395196
Review URL: https://codereview.chromium.org/415323002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@285752 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'PRESUBMIT.py')
| -rw-r--r-- | PRESUBMIT.py | 26 |
1 files changed, 21 insertions, 5 deletions
diff --git a/PRESUBMIT.py b/PRESUBMIT.py index ecb3538..72aa248 100644 --- a/PRESUBMIT.py +++ b/PRESUBMIT.py @@ -1418,13 +1418,29 @@ def CheckChangeOnUpload(input_api, output_api): def GetTryServerMasterForBot(bot): """Returns the Try Server master for the given bot. - Assumes that most Try Servers are on the tryserver.chromium master.""" - non_default_master_map = { + It tries to guess the master from the bot name, but may still fail + and return None. There is no longer a default master. + """ + # Potentially ambiguous bot names are listed explicitly. + master_map = { 'linux_gpu': 'tryserver.chromium.gpu', 'mac_gpu': 'tryserver.chromium.gpu', 'win_gpu': 'tryserver.chromium.gpu', + 'chromium_presubmit': 'tryserver.chromium.linux', + 'blink_presubmit': 'tryserver.chromium.linux', + 'tools_build_presubmit': 'tryserver.chromium.linux', } - return non_default_master_map.get(bot, 'tryserver.chromium') + master = master_map.get(bot) + if not master: + if 'gpu' in bot: + master = 'tryserver.chromium.gpu' + elif 'linux' in bot or 'android' in bot or 'presubmit' in bot: + master = 'tryserver.chromium.linux' + elif 'win' in bot: + master = 'tryserver.chromium.win' + elif 'mac' in bot or 'ios' in bot: + master = 'tryserver.chromium.mac' + return master def GetDefaultTryConfigs(bots=None): @@ -1495,7 +1511,7 @@ def GetDefaultTryConfigs(bots=None): 'linux_chromium_chromeos_rel': ['defaulttests'], 'linux_chromium_compile_dbg': ['defaulttests'], 'linux_chromium_gn_rel': ['defaulttests'], - 'linux_chromium_rel': ['defaulttests'], + 'linux_chromium_rel_swarming': ['defaulttests'], 'linux_chromium_clang_dbg': ['defaulttests'], 'linux_gpu': ['defaulttests'], 'linux_nacl_sdk_build': ['compile'], @@ -1577,7 +1593,7 @@ def GetPreferredTryMasters(project, change): 'linux_chromium_chromeos_rel', 'linux_chromium_clang_dbg', 'linux_chromium_gn_rel', - 'linux_chromium_rel', + 'linux_chromium_rel_swarming', 'linux_gpu', 'mac_chromium_compile_dbg', 'mac_chromium_rel', |