From 59994802e8750cabedea18fa54146e98d31d5255 Mon Sep 17 00:00:00 2001 From: "machenbach@chromium.org" Date: Thu, 14 Jan 2016 10:10:33 +0000 Subject: [PATCH] git cl try: omit triggered bots from cq.cfg default list BUG=522909,565952 Review URL: https://codereview.chromium.org/1587893003 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@298261 0039d316-1c4b-4281-b951-d872f2087c98 --- commit_queue.py | 12 +++++++++--- git_cl.py | 3 ++- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/commit_queue.py b/commit_queue.py index c950db68cd..7adcc975c0 100755 --- a/commit_queue.py +++ b/commit_queue.py @@ -105,7 +105,8 @@ def set_commit(obj, issue, flag): _apply_on_issue(_set_commit, obj, issue) -def get_master_builder_map(config_path): +def get_master_builder_map( + config_path, include_experimental=True, include_triggered=True): """Returns a map of master -> [builders] from cq config.""" with open(config_path) as config_file: cq_config = config_file.read() @@ -117,8 +118,13 @@ def get_master_builder_map(config_path): for bucket in config.verifiers.try_job.buckets: masters.setdefault(bucket.name, []) for builder in bucket.builders: - if not builder.HasField('experiment_percentage'): - masters[bucket.name].append(builder.name) + if (not include_experimental and + builder.HasField('experiment_percentage')): + continue + if (not include_triggered and + builder.HasField('triggered_by')): + continue + masters[bucket.name].append(builder.name) return masters diff --git a/git_cl.py b/git_cl.py index b5289f772c..ff83f10edc 100755 --- a/git_cl.py +++ b/git_cl.py @@ -3237,7 +3237,8 @@ def CMDtry(parser, args): 'infra', 'config', 'cq.cfg') if os.path.exists(cq_cfg): masters = {} - cq_masters = commit_queue.get_master_builder_map(cq_cfg) + cq_masters = commit_queue.get_master_builder_map( + cq_cfg, include_experimental=False, include_triggered=False) for master, builders in cq_masters.iteritems(): for builder in builders: # Skip presubmit builders, because these will fail without LGTM.