From 29e30039b0b7cbfffa2ecec91f510b7a7f94c3f8 Mon Sep 17 00:00:00 2001 From: "kjellander@webrtc.org" Date: Thu, 3 Dec 2015 15:04:43 +0100 Subject: [PATCH] Bring back baremetal trybots to the default set. These bots were removed with the reasoning that they were slowing down the CQ. However the Android bots are still our bottleneck, so it makes sense to run them by default instead. Update the autoroll script to not specify them as EXTRA_TRYBOTS. R=phoglund@webrtc.org Review URL: https://codereview.webrtc.org/1496863003 . Cr-Commit-Position: refs/heads/master@{#10884} --- infra/config/cq.cfg | 9 ++++++--- tools/autoroller/roll_chromium_revision.py | 4 ---- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/infra/config/cq.cfg b/infra/config/cq.cfg index 7d2f6739c7..439f826fcf 100644 --- a/infra/config/cq.cfg +++ b/infra/config/cq.cfg @@ -40,27 +40,30 @@ verifiers { builders { name: "ios_rel" } builders { name: "ios32_sim_dbg" } builders { name: "ios64_sim_dbg" } - builders { name: "linux_compile_dbg" } builders { name: "linux_asan" } + builders { name: "linux_baremetal" } + builders { name: "linux_compile_dbg" } builders { name: "linux_gn_dbg" } builders { name: "linux_gn_rel" } builders { name: "linux_msan" } builders { name: "linux_rel" } builders { name: "linux_tsan2" } + builders { name: "mac_asan" } + builders { name: "mac_baremetal" } builders { name: "mac_compile_dbg" } builders { name: "mac_compile_x64_dbg" } - builders { name: "mac_asan" } builders { name: "mac_rel" } builders { name: "mac_x64_gn_dbg" } builders { name: "mac_x64_gn_rel" } builders { name: "mac_x64_rel" } builders { name: "presubmit" } + builders { name: "win_baremetal" } builders { name: "win_compile_dbg" } + builders { name: "win_drmemory_light" } builders { name: "win_rel" } builders { name: "win_x64_gn_dbg" } builders { name: "win_x64_gn_rel" } builders { name: "win_x64_rel" } - builders { name: "win_drmemory_light" } } } } diff --git a/tools/autoroller/roll_chromium_revision.py b/tools/autoroller/roll_chromium_revision.py index 56d878ac9b..1f974e02ef 100755 --- a/tools/autoroller/roll_chromium_revision.py +++ b/tools/autoroller/roll_chromium_revision.py @@ -25,9 +25,6 @@ CHROMIUM_COMMIT_TEMPLATE = CHROMIUM_SRC_URL + '/+/%s' CHROMIUM_LOG_TEMPLATE = CHROMIUM_SRC_URL + '/+log/%s' CHROMIUM_FILE_TEMPLATE = CHROMIUM_SRC_URL + '/+/%s/%s' -# Run these CQ trybots in addition to the default ones in infra/config/cq.cfg. -EXTRA_TRYBOTS = 'tryserver.webrtc:win_baremetal,mac_baremetal,linux_baremetal' - COMMIT_POSITION_RE = re.compile('^Cr-Commit-Position: .*#([0-9]+).*$') CLANG_REVISION_RE = re.compile(r'^CLANG_REVISION=(\d+)$') ROLL_BRANCH_NAME = 'roll_chromium_revision' @@ -292,7 +289,6 @@ def GenerateCommitMessage(current_cr_rev, new_cr_rev, current_commit_pos, commit_msg.append('No update to Clang.\n') commit_msg.append('TBR=%s' % tbr_authors) - commit_msg.append('CQ_EXTRA_TRYBOTS=%s' % EXTRA_TRYBOTS) return '\n'.join(commit_msg)