From a46f10329c1c97fe67333bc6c4f56c66d68d9e9b Mon Sep 17 00:00:00 2001
From: Jeremy Leconte <jleconte@google.com>
Date: Tue, 27 Aug 2024 07:33:28 +0200
Subject: [PATCH] Re-enable iOS simulator from CQ and LKGR.

Change-Id: I734f2b6b5f24de766c933c130bf9f89def0cb8cc
Bug: b/357552398
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/360720
Auto-Submit: Jeremy Leconte <jleconte@google.com>
Commit-Queue: Jeremy Leconte <jleconte@google.com>
Reviewed-by: Christoffer Dewerin <jansson@webrtc.org>
Commit-Queue: Christoffer Dewerin <jansson@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#42856}
---
 infra/config/commit-queue.cfg   | 6 ++++++
 infra/config/config.star        | 6 ++----
 infra/config/cr-buildbucket.cfg | 1 +
 infra/config/luci-notify.cfg    | 5 +++++
 infra/config/project.cfg        | 2 +-
 5 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/infra/config/commit-queue.cfg b/infra/config/commit-queue.cfg
index 998655d14b..7efd3996cc 100644
--- a/infra/config/commit-queue.cfg
+++ b/infra/config/commit-queue.cfg
@@ -90,6 +90,9 @@ config_groups {
       builders {
         name: "webrtc/try/ios_compile_arm64_rel"
       }
+      builders {
+        name: "webrtc/try/ios_dbg_simulator"
+      }
       builders {
         name: "webrtc/try/linux_asan"
       }
@@ -267,6 +270,9 @@ config_groups {
       builders {
         name: "webrtc/try/ios_compile_arm64_rel"
       }
+      builders {
+        name: "webrtc/try/ios_dbg_simulator"
+      }
       builders {
         name: "webrtc/try/linux_asan"
       }
diff --git a/infra/config/config.star b/infra/config/config.star
index c586b252e8..560da35297 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 = [
-    "iOS Debug (simulator)",
-]
+skipped_lkgr_bots = []
 
 # Use LUCI Scheduler BBv2 names and add Scheduler realms configs.
 lucicfg.enable_experiment("crbug.com/1182002")
@@ -747,7 +745,7 @@ ios_try_job("ios_compile_arm64_dbg")
 ios_builder("iOS64 Release", "iOS|arm64|rel")
 ios_try_job("ios_compile_arm64_rel")
 ios_builder("iOS Debug (simulator)", "iOS|x64|sim")
-ios_try_job("ios_dbg_simulator", cq = None)
+ios_try_job("ios_dbg_simulator")
 ios_builder("iOS API Framework Builder", "iOS|fat|size", recipe = "ios_api_framework", prioritized = True)
 ios_try_job("ios_api_framework", recipe = "ios_api_framework")
 
diff --git a/infra/config/cr-buildbucket.cfg b/infra/config/cr-buildbucket.cfg
index 2d7f2b7c14..23a8544f97 100644
--- a/infra/config/cr-buildbucket.cfg
+++ b/infra/config/cr-buildbucket.cfg
@@ -1903,6 +1903,7 @@ buckets {
         '          "Win64 Debug (Clang)",'
         '          "Win64 Release (Clang)",'
         '          "iOS API Framework Builder",'
+        '          "iOS Debug (simulator)",'
         '          "iOS64 Debug",'
         '          "iOS64 Release"'
         '        ]'
diff --git a/infra/config/luci-notify.cfg b/infra/config/luci-notify.cfg
index e2835fb848..53a6c5eb3b 100644
--- a/infra/config/luci-notify.cfg
+++ b/infra/config/luci-notify.cfg
@@ -943,6 +943,11 @@ notifiers {
     name: "iOS Debug (simulator)"
     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 f3548e95a2..53615b4c2a 100644
--- a/infra/config/project.cfg
+++ b/infra/config/project.cfg
@@ -7,7 +7,7 @@
 name: "webrtc"
 access: "group:all"
 lucicfg {
-  version: "1.43.10"
+  version: "1.43.12"
   package_dir: "."
   config_dir: "."
   entry_point: "config.star"