From ea457a6648fe41b89152978f50f17fc01e0e5c63 Mon Sep 17 00:00:00 2001 From: landrey Date: Mon, 4 Apr 2022 07:55:30 +0000 Subject: [PATCH] Return linux bots to cq and lkgr as the issue with them is fixed Bug: chromium:1311236 Change-Id: I1086b0d45472a95f839b1ef503278ad45745d676 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/257880 Auto-Submit: Andrey Logvin Commit-Queue: Andrey Logvin Reviewed-by: Christoffer Jansson Commit-Queue: Christoffer Jansson Cr-Commit-Position: refs/heads/main@{#36419} --- infra/config/commit-queue.cfg | 12 ++++++++++++ infra/config/config.star | 11 ++--------- infra/config/cr-buildbucket.cfg | 2 ++ infra/config/luci-notify.cfg | 10 ++++++++++ 4 files changed, 26 insertions(+), 9 deletions(-) diff --git a/infra/config/commit-queue.cfg b/infra/config/commit-queue.cfg index cd4fc27b38..ac8c474e27 100644 --- a/infra/config/commit-queue.cfg +++ b/infra/config/commit-queue.cfg @@ -130,6 +130,12 @@ config_groups { builders { name: "webrtc/try/linux_ubsan_vptr" } + builders { + name: "webrtc/try/linux_x86_dbg" + } + builders { + name: "webrtc/try/linux_x86_rel" + } builders { name: "webrtc/try/mac_asan" } @@ -282,6 +288,12 @@ config_groups { builders { name: "webrtc/try/linux_ubsan_vptr" } + builders { + name: "webrtc/try/linux_x86_dbg" + } + builders { + name: "webrtc/try/linux_x86_rel" + } builders { name: "webrtc/try/mac_asan" } diff --git a/infra/config/config.star b/infra/config/config.star index 9b270251cf..8be9be5493 100755 --- a/infra/config/config.star +++ b/infra/config/config.star @@ -42,9 +42,6 @@ def make_goma_properties(enable_ats = True, jobs = None): # useful when a failure can be safely ignored while fixing it without # blocking the LKGR finder on it. skipped_lkgr_bots = [ - # TODO(crbug.com/1311236): return to lkgr once the issue is fixed. - "Linux32 Debug", - "Linux32 Release", ] # Use LUCI Scheduler BBv2 names and add Scheduler realms configs. @@ -725,13 +722,9 @@ ios_builder_macos11("iOS API Framework Builder", "iOS|fat|size", recipe = "ios_a ios_try_job_macos11("ios_api_framework", recipe = "ios_api_framework") linux_builder("Linux32 Debug", "Linux|x86|dbg") - -# TODO(crbug.com/1311236): return to CQ once the issue is fixed. -linux_try_job("linux_x86_dbg", cq = None) +linux_try_job("linux_x86_dbg") linux_builder("Linux32 Release", "Linux|x86|rel") - -# TODO(crbug.com/1311236): return to CQ once the issue is fixed. -linux_try_job("linux_x86_rel", cq = None) +linux_try_job("linux_x86_rel") linux_builder("Linux64 Debug", "Linux|x64|dbg") linux_try_job("linux_dbg", cq = None) linux_try_job("linux_compile_dbg") diff --git a/infra/config/cr-buildbucket.cfg b/infra/config/cr-buildbucket.cfg index 1edc4c8e8c..af6fa26ae8 100644 --- a/infra/config/cr-buildbucket.cfg +++ b/infra/config/cr-buildbucket.cfg @@ -2289,7 +2289,9 @@ buckets { ' "Linux Tsan v2",' ' "Linux UBSan",' ' "Linux UBSan vptr",' + ' "Linux32 Debug",' ' "Linux32 Debug (ARM)",' + ' "Linux32 Release",' ' "Linux32 Release (ARM)",' ' "Linux64 Builder",' ' "Linux64 Debug",' diff --git a/infra/config/luci-notify.cfg b/infra/config/luci-notify.cfg index 0cfed4af72..4d20b9fd3a 100644 --- a/infra/config/luci-notify.cfg +++ b/infra/config/luci-notify.cfg @@ -430,6 +430,11 @@ notifiers { name: "Linux32 Debug" repository: "https://webrtc.googlesource.com/src" } + tree_closers { + tree_status_host: "webrtc-status.appspot.com" + failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update|extract build|cleanup_temp|taskkill|compile|gn" + failed_step_regexp_exclude: ".*\\(experimental\\).*" + } } notifiers { notifications { @@ -479,6 +484,11 @@ notifiers { name: "Linux32 Release" repository: "https://webrtc.googlesource.com/src" } + tree_closers { + tree_status_host: "webrtc-status.appspot.com" + failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update|extract build|cleanup_temp|taskkill|compile|gn" + failed_step_regexp_exclude: ".*\\(experimental\\).*" + } } notifiers { notifications {