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

Unified Diff: PRESUBMIT.py

Issue 823823002: Use checked-in CQ config to get trybots to launch from PRESUBMIT.py (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fixes Created 6 years 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 | no next file » | 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 d41cc7574a008a546551c86da513dd07463917bd..4054885c1fddc7c724f0b9bca6e92ee8605c0498 100644
--- a/PRESUBMIT.py
+++ b/PRESUBMIT.py
@@ -1685,40 +1685,21 @@ def GetPreferredTryMasters(project, change):
if all(re.search(r'[\\\/_]ios[\\\/_.]', f) for f in files):
return GetDefaultTryConfigs(['ios_rel_device', 'ios_dbg_simulator'])
- builders = [
- 'android_aosp',
- 'android_arm64_dbg_recipe',
- 'android_arm64_dbg_recipe',
- 'android_chromium_gn_compile_dbg',
- 'android_chromium_gn_compile_rel',
- 'android_clang_dbg_recipe',
- 'android_clang_dbg_recipe',
- 'android_dbg_tests_recipe',
- 'ios_dbg_simulator',
- 'ios_rel_device',
- 'ios_rel_device_ninja',
- 'linux_chromium_asan_rel',
- 'linux_chromium_chromeos_compile_dbg_ng',
- 'linux_chromium_chromeos_rel_ng',
- 'linux_chromium_compile_dbg_32_ng',
- 'linux_chromium_gn_dbg',
- 'linux_chromium_gn_rel',
- 'linux_chromium_rel_ng',
- 'linux_gpu',
- 'mac_chromium_compile_dbg_ng',
- 'mac_chromium_rel_ng',
- 'win8_chromium_rel',
- 'win_chromium_compile_dbg',
- 'win_chromium_rel_ng',
- 'win_chromium_x64_rel_ng',
- 'win_gpu',
- ]
+ import os
Sergiy Byelozyorov 2014/12/24 16:12:34 Why import here and not on top of the file? Also s
Paweł Hajdan Jr. 2015/01/07 16:04:27 GetPreferredTryMasters unfortunately doesn't get i
+ import json
+ with open(os.path.join(
+ change.RepositoryRoot(), 'testing', 'commit_queue', 'config.json')) as f:
+ cq_config = json.load(f)
+ cq_trybots = cq_config.get('trybots', {})
+ builders = cq_trybots.get('launched', {})
+ for master, master_config in cq_trybots.get('triggered', {}).iteritems():
+ for triggered_bot in master_config:
+ builders.get(master, {}).pop(triggered_bot, None)
# Match things like path/aura/file.cc and path/file_aura.cc.
# Same for chromeos.
if any(re.search(r'[\\\/_](aura|chromeos)', f) for f in files):
- builders.extend([
- 'linux_chromium_chromeos_asan_rel_ng',
- ])
+ builders.setdefault('tryserver.chromium.linux', {})[
+ 'linux_chromium_chromeos_asan_rel_ng'] = ['defaulttests']
Sergiy Byelozyorov 2014/12/24 16:12:34 This is a bit hard to read. Can you please split i
Paweł Hajdan Jr. 2015/01/07 16:04:27 Done.
- return GetDefaultTryConfigs(builders)
+ return builders
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698