diff options
| author | Tom Hughes <tomhughes@chromium.org> | 2021-02-05 13:55:43 -0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-02-05 23:03:45 +0000 |
| commit | f9556364a3a1b36668e6c7778590c93c9a767b36 (patch) | |
| tree | 48725e85dfd97eef96a35e833fc2c8be7159f1f3 | |
| parent | 689ff97247ec53f907fe72d6308baa909cdf0b18 (diff) | |
| download | chrome-ec-f9556364a3a1b36668e6c7778590c93c9a767b36.tar.gz | |
util/update_release_branch.py: Build release branches on normal CQ
There appear to be differences in how the firmware CQ and normal CQ
build. To avoid breaking the normal CQ, force release branch CLs to run
on the normal CQ.
BRANCH=none
BUG=b:179509333
TEST=none
Signed-off-by: Tom Hughes <tomhughes@chromium.org>
Change-Id: I18655d7959451c0f5848e6ada613dd1c52bae5c6
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2679768
Commit-Queue: LaMont Jones <lamontjones@chromium.org>
Reviewed-by: LaMont Jones <lamontjones@chromium.org>
| -rwxr-xr-x | util/update_release_branch.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/util/update_release_branch.py b/util/update_release_branch.py index 81e5ec73cd..222c7b01ba 100755 --- a/util/update_release_branch.py +++ b/util/update_release_branch.py @@ -56,6 +56,8 @@ def git_commit_msg(branch, head, merge_head, rel_paths): filtered.append(bug) relevant_bugs = filtered + # TODO(b/179509333): remove Cq-Include-Trybots line when regular CQ and + # firmware CQ do not behave differently. COMMIT_MSG_TEMPLATE = """ Merge remote-tracking branch cros/main into {BRANCH} @@ -69,6 +71,7 @@ BRANCH=None {BUG_FIELD} TEST=`make -j buildall` +Cq-Include-Trybots: chromeos/cq:cq-orchestrator """ # Wrap the relevant commits command and bug field such that we don't exceed # 72 cols. |