Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(258)

Unified Diff: PRESUBMIT.py

Issue 415323002: Update masters after the tryserver split. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: linux_blink_rel on tryserver.blink Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | PRESUBMIT_test.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: PRESUBMIT.py
diff --git a/PRESUBMIT.py b/PRESUBMIT.py
index ecb3538907d4e23491ab9d7f06f913e25b29440f..72aa2484806a446c78d142089b436148c76ae705 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',
« no previous file with comments | « no previous file | PRESUBMIT_test.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698