From c6e06aef5ea9e84135192a48a242b6d8314cb449 Mon Sep 17 00:00:00 2001
From: Bjorn Terelius <terelius@webrtc.org>
Date: Fri, 15 Mar 2024 11:16:40 +0100
Subject: [PATCH] Re-enable msan bots
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bug: b/329130536
Change-Id: I4bc9102a3fda16121cb42d682f80a7b124daed42
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/343180
Reviewed-by: Jeremy Leconte <jleconte@google.com>
Commit-Queue: Björn Terelius <terelius@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#41905}
---
 infra/config/commit-queue.cfg   | 6 ++++++
 infra/config/config.star        | 6 ++----
 infra/config/cr-buildbucket.cfg | 1 +
 infra/config/luci-notify.cfg    | 5 +++++
 4 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/infra/config/commit-queue.cfg b/infra/config/commit-queue.cfg
index c6d9ad0040..7efd3996cc 100644
--- a/infra/config/commit-queue.cfg
+++ b/infra/config/commit-queue.cfg
@@ -126,6 +126,9 @@ config_groups {
       builders {
         name: "webrtc/try/linux_more_configs"
       }
+      builders {
+        name: "webrtc/try/linux_msan"
+      }
       builders {
         name: "webrtc/try/linux_rel"
       }
@@ -300,6 +303,9 @@ config_groups {
       builders {
         name: "webrtc/try/linux_more_configs"
       }
+      builders {
+        name: "webrtc/try/linux_msan"
+      }
       builders {
         name: "webrtc/try/linux_rel"
       }
diff --git a/infra/config/config.star b/infra/config/config.star
index cea4883b1e..c070fa4074 100755
--- a/infra/config/config.star
+++ b/infra/config/config.star
@@ -52,9 +52,7 @@ def os_from_name(name):
 # Add names of builders to remove from LKGR finder to this list. This is
 # useful when a failure can be safely ignored while fixing it without
 # blocking the LKGR finder on it.
-skipped_lkgr_bots = [
-    "Linux MSan",  # TODO(b/329130536): Re-enable
-]
+skipped_lkgr_bots = []
 
 # Use LUCI Scheduler BBv2 names and add Scheduler realms configs.
 lucicfg.enable_experiment("crbug.com/1182002")
@@ -762,7 +760,7 @@ try_builder("linux_compile_arm64_rel")
 ci_builder("Linux Asan", "Linux|x64|asan")
 try_builder("linux_asan")
 ci_builder("Linux MSan", "Linux|x64|msan")
-try_builder("linux_msan", cq = None)  # TODO(b/329130536): Re-enable
+try_builder("linux_msan")
 ci_builder("Linux Tsan v2", "Linux|x64|tsan")
 try_builder("linux_tsan2")
 ci_builder("Linux UBSan", "Linux|x64|ubsan")
diff --git a/infra/config/cr-buildbucket.cfg b/infra/config/cr-buildbucket.cfg
index 3ab021a7c2..039c580a34 100644
--- a/infra/config/cr-buildbucket.cfg
+++ b/infra/config/cr-buildbucket.cfg
@@ -1879,6 +1879,7 @@ buckets {
         '          "Fuchsia Release",'
         '          "Linux (more configs)",'
         '          "Linux Asan",'
+        '          "Linux MSan",'
         '          "Linux Tsan v2",'
         '          "Linux UBSan",'
         '          "Linux UBSan vptr",'
diff --git a/infra/config/luci-notify.cfg b/infra/config/luci-notify.cfg
index eb9544a284..129d0e4268 100644
--- a/infra/config/luci-notify.cfg
+++ b/infra/config/luci-notify.cfg
@@ -295,6 +295,11 @@ notifiers {
     name: "Linux MSan"
     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 {