diff --git a/infra/config/commit-queue.cfg b/infra/config/commit-queue.cfg index ac8c474e27..75e61e9123 100644 --- a/infra/config/commit-queue.cfg +++ b/infra/config/commit-queue.cfg @@ -130,12 +130,6 @@ 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" } @@ -145,9 +139,6 @@ config_groups { builders { name: "webrtc/try/mac_compile_dbg" } - builders { - name: "webrtc/try/mac_rel" - } builders { name: "webrtc/try/presubmit" disable_reuse: true @@ -288,21 +279,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" } builders { name: "webrtc/try/mac_compile_dbg" } - builders { - name: "webrtc/try/mac_rel" - } builders { name: "webrtc/try/presubmit" disable_reuse: true diff --git a/infra/config/config.star b/infra/config/config.star index 8be9be5493..932c887c49 100755 --- a/infra/config/config.star +++ b/infra/config/config.star @@ -42,6 +42,9 @@ 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. @@ -722,9 +725,13 @@ 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") -linux_try_job("linux_x86_dbg") + +# TODO(crbug.com/1311236): return to CQ once the issue is fixed. +linux_try_job("linux_x86_dbg", cq = None) linux_builder("Linux32 Release", "Linux|x86|rel") -linux_try_job("linux_x86_rel") + +# TODO(crbug.com/1311236): return to CQ once the issue is fixed. +linux_try_job("linux_x86_rel", cq = None) linux_builder("Linux64 Debug", "Linux|x64|dbg") linux_try_job("linux_dbg", cq = None) linux_try_job("linux_compile_dbg") @@ -763,7 +770,9 @@ mac_builder("Mac64 Debug", "Mac|x64|dbg") mac_try_job("mac_dbg", cq = None) mac_try_job("mac_compile_dbg") mac_builder("Mac64 Release", "Mac|x64|rel") -mac_try_job("mac_rel") + +# TODO(landrey): add back to CQ once ManyCam issue is fixed. +mac_try_job("mac_rel", cq = None) mac_try_job("mac_compile_rel", cq = None) mac_builder("Mac64 Builder", ci_cat = None, perf_cat = "Mac|x64|Builder|") perf_builder("Perf Mac 10.11", "Mac|x64|Tester|10.11", triggered_by = ["Mac64 Builder"]) diff --git a/infra/config/cr-buildbucket.cfg b/infra/config/cr-buildbucket.cfg index af6fa26ae8..1edc4c8e8c 100644 --- a/infra/config/cr-buildbucket.cfg +++ b/infra/config/cr-buildbucket.cfg @@ -2289,9 +2289,7 @@ 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 4d20b9fd3a..0cfed4af72 100644 --- a/infra/config/luci-notify.cfg +++ b/infra/config/luci-notify.cfg @@ -430,11 +430,6 @@ 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 { @@ -484,11 +479,6 @@ 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 { diff --git a/infra/config/project.cfg b/infra/config/project.cfg index 3f14e8cd4c..692d4571a8 100644 --- a/infra/config/project.cfg +++ b/infra/config/project.cfg @@ -7,7 +7,7 @@ name: "webrtc" access: "group:all" lucicfg { - version: "1.30.10" + version: "1.30.11" package_dir: "." config_dir: "." entry_point: "config.star"