From afe1680609ac6e4370b9976265888ded15599ce3 Mon Sep 17 00:00:00 2001
From: Christoffer Jansson <jansson@webrtc.org>
Date: Fri, 20 May 2022 13:46:43 +0200
Subject: [PATCH] Add cluster rules, fix bug instance

Bug: b/227310186
Change-Id: I39fa3204f0dd6b514dc468b29faa819c644486a8
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/262942
Commit-Queue: Christoffer Jansson <jansson@webrtc.org>
Reviewed-by: Jeremy Leconte <jleconte@google.com>
Cr-Commit-Position: refs/heads/main@{#36943}
---
 infra/config/chops-weetbix-dev.cfg | 63 +++++++++++++++++++++++++++---
 infra/config/chops-weetbix.cfg     | 62 ++++++++++++++++++++++++++---
 2 files changed, 115 insertions(+), 10 deletions(-)

diff --git a/infra/config/chops-weetbix-dev.cfg b/infra/config/chops-weetbix-dev.cfg
index eaef9eae73..9b3caa6c6b 100644
--- a/infra/config/chops-weetbix-dev.cfg
+++ b/infra/config/chops-weetbix-dev.cfg
@@ -14,13 +14,18 @@ bug_filing_threshold {
 }
 clustering {
   test_name_rules {
-    name: "Tast Tests"
-    pattern: "^tast\\.(?P<suite>([^.]+))\\.(?P<testname>([^.]+))\\..*$"
-    like_template: "tast.${suite}.${testname}.%"
+    name: "Google Test (Type-parameterized)"
+    pattern: "^ninja:(?P<target>[\\w/]+:\\w+)/(\\w+/)?(?P<suite>\\w+)/\\w+\\.(?P<case>\\w+)$"
+    like_template: "ninja:${target}/%${suite}/%.${case}"
+  }
+  test_name_rules {
+    name: "Google Test (Value-parameterized)"
+    pattern: "^ninja:(?P<target>[\\w/]+:\\w+)/(\\w+/)?(?P<suite>\\w+)\\.(?P<case>\\w+)/[\\w.]+$"
+    like_template: "ninja:${target}/%${suite}.${case}%"
   }
 }
 monorail {
-  project: "chromium"
+  project: "webrtc"
   default_field_values {
     # Type field.
     field_id: 10
@@ -66,5 +71,53 @@ monorail {
   }
   priority_hysteresis_percent: 50
   monorail_hostname: "monorail-staging.appspot.com"
-  display_prefix: "crbug.com"
+  display_prefix: "bugs.webrtc.org"
+}
+
+realms {
+  name: "ci"
+  test_variant_analysis {
+    update_test_variant_task {
+      update_test_variant_task_interval {
+        seconds: 3600 # 1 hour
+      }
+      test_variant_status_update_duration {
+        seconds: 86400 # 24 hours
+      }
+    }
+    bq_exports {
+      table {
+        cloud_project: "webrtc-ci"
+        dataset: "weetbix"
+        table: "ci_flaky_test_variants"
+      }
+      predicate {
+        status: FLAKY
+      }
+    }
+  }
+}
+
+realms {
+  name: "try"
+  test_variant_analysis {
+    update_test_variant_task {
+      update_test_variant_task_interval {
+        seconds: 3600 # 1 hour
+      }
+      test_variant_status_update_duration {
+        seconds: 86400 # 24 hours
+      }
+    }
+    bq_exports {
+      table {
+        cloud_project: "webrtc-ci"
+        dataset: "weetbix"
+        table: "try_flaky_test_variants"
+      }
+      predicate {
+        status: FLAKY
+      }
+    }
+  }
 }
diff --git a/infra/config/chops-weetbix.cfg b/infra/config/chops-weetbix.cfg
index 9c9f153e00..d0c70aba45 100644
--- a/infra/config/chops-weetbix.cfg
+++ b/infra/config/chops-weetbix.cfg
@@ -14,13 +14,18 @@ bug_filing_threshold {
 }
 clustering {
   test_name_rules {
-    name: "Tast Tests"
-    pattern: "^tast\\.(?P<suite>([^.]+))\\.(?P<testname>([^.]+))\\..*$"
-    like_template: "tast.${suite}.${testname}.%"
+    name: "Google Test (Type-parameterized)"
+    pattern: "^ninja:(?P<target>[\\w/]+:\\w+)/(\\w+/)?(?P<suite>\\w+)/\\w+\\.(?P<case>\\w+)$"
+    like_template: "ninja:${target}/%${suite}/%.${case}"
+  }
+  test_name_rules {
+    name: "Google Test (Value-parameterized)"
+    pattern: "^ninja:(?P<target>[\\w/]+:\\w+)/(\\w+/)?(?P<suite>\\w+)\\.(?P<case>\\w+)/[\\w.]+$"
+    like_template: "ninja:${target}/%${suite}.${case}%"
   }
 }
 monorail {
-  project: "chromium"
+  project: "webrtc"
   default_field_values {
     # Type field.
     field_id: 10
@@ -66,6 +71,53 @@ monorail {
   }
   priority_hysteresis_percent: 50
   monorail_hostname: "bugs.chromium.org"
-  display_prefix: "crbug.com"
+  display_prefix: "bugs.webrtc.org"
 }
 
+realms {
+  name: "ci"
+  test_variant_analysis {
+    update_test_variant_task {
+      update_test_variant_task_interval {
+        seconds: 3600 # 1 hour
+      }
+      test_variant_status_update_duration {
+        seconds: 86400 # 24 hours
+      }
+    }
+    bq_exports {
+      table {
+        cloud_project: "webrtc-ci"
+        dataset: "weetbix"
+        table: "ci_flaky_test_variants"
+      }
+      predicate {
+        status: FLAKY
+      }
+    }
+  }
+}
+
+realms {
+  name: "try"
+  test_variant_analysis {
+    update_test_variant_task {
+      update_test_variant_task_interval {
+        seconds: 3600 # 1 hour
+      }
+      test_variant_status_update_duration {
+        seconds: 86400 # 24 hours
+      }
+    }
+    bq_exports {
+      table {
+        cloud_project: "webrtc-ci"
+        dataset: "weetbix"
+        table: "try_flaky_test_variants"
+      }
+      predicate {
+        status: FLAKY
+      }
+    }
+  }
+}