summaryrefslogtreecommitdiffstats
path: root/PRESUBMIT.py
diff options
context:
space:
mode:
authorsmut <smut@google.com>2015-03-20 02:30:00 -0700
committerCommit bot <commit-bot@chromium.org>2015-03-20 09:30:32 +0000
commit3ef206e1494c1cd0fc16c0ff71b5c2d1dc2bb54c (patch)
treefbc6053c112b276ee266a3146b9d5e0662f0cf38 /PRESUBMIT.py
parent8d03738450a186e736d5db0eba53bdd56a376613 (diff)
downloadchromium_src-3ef206e1494c1cd0fc16c0ff71b5c2d1dc2bb54c.zip
chromium_src-3ef206e1494c1cd0fc16c0ff71b5c2d1dc2bb54c.tar.gz
chromium_src-3ef206e1494c1cd0fc16c0ff71b5c2d1dc2bb54c.tar.bz2
Make git cl try work in light of the new CQ config.json format
BUG=468841 TBR=jochen@chromium.org TESTED=All try jobs for this CL were triggered using a no-argument "git cl try". Review URL: https://codereview.chromium.org/1020973003 Cr-Commit-Position: refs/heads/master@{#321537}
Diffstat (limited to 'PRESUBMIT.py')
-rw-r--r--PRESUBMIT.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/PRESUBMIT.py b/PRESUBMIT.py
index d8f4fd1..3c76e2b 100644
--- a/PRESUBMIT.py
+++ b/PRESUBMIT.py
@@ -1749,9 +1749,11 @@ def GetPreferredTryMasters(project, change):
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():
+ cq_verifiers = cq_config.get('verifiers_no_patch', {})
+ cq_try_jobs = cq_verifiers.get('try_job_verifier', {})
+ builders = cq_try_jobs.get('launched', {})
+
+ for master, master_config in cq_try_jobs.get('triggered', {}).iteritems():
for triggered_bot in master_config:
builders.get(master, {}).pop(triggered_bot, None)