From dbfa78114b079181c27737fadde1255ac8a6ccff Mon Sep 17 00:00:00 2001
From: Patrick Meiring <meiring@google.com>
Date: Mon, 23 May 2022 04:03:56 +0000
Subject: [PATCH] Revert "Add cluster rules, fix bug instance"

This reverts commit afe1680609ac6e4370b9976265888ded15599ce3.

Reason for revert: Bad configuration, causes alerts to fire in Weetbix dev/prod.

Original change's description:
> 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}

Bug: b/227310186
Change-Id: I8a0fd8662765b50175960bc28fae5c3254588772
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/263100
Auto-Submit: Patrick Meiring <meiring@google.com>
Reviewed-by: Jeremy Leconte <jleconte@google.com>
Commit-Queue: Jeremy Leconte <jleconte@webrtc.org>
Bot-Commit: rubber-stamper@appspot.gserviceaccount.com <rubber-stamper@appspot.gserviceaccount.com>
Reviewed-by: Jeremy Leconte <jleconte@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#36962}
---
 infra/config/chops-weetbix-dev.cfg | 63 +++---------------------------
 infra/config/chops-weetbix.cfg     | 62 +++--------------------------
 2 files changed, 10 insertions(+), 115 deletions(-)

diff --git a/infra/config/chops-weetbix-dev.cfg b/infra/config/chops-weetbix-dev.cfg
index 9b3caa6c6b..eaef9eae73 100644
--- a/infra/config/chops-weetbix-dev.cfg
+++ b/infra/config/chops-weetbix-dev.cfg
@@ -14,18 +14,13 @@ bug_filing_threshold {
 }
 clustering {
   test_name_rules {
-    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}%"
+    name: "Tast Tests"
+    pattern: "^tast\\.(?P<suite>([^.]+))\\.(?P<testname>([^.]+))\\..*$"
+    like_template: "tast.${suite}.${testname}.%"
   }
 }
 monorail {
-  project: "webrtc"
+  project: "chromium"
   default_field_values {
     # Type field.
     field_id: 10
@@ -71,53 +66,5 @@ monorail {
   }
   priority_hysteresis_percent: 50
   monorail_hostname: "monorail-staging.appspot.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
-      }
-    }
-  }
+  display_prefix: "crbug.com"
 }
diff --git a/infra/config/chops-weetbix.cfg b/infra/config/chops-weetbix.cfg
index d0c70aba45..9c9f153e00 100644
--- a/infra/config/chops-weetbix.cfg
+++ b/infra/config/chops-weetbix.cfg
@@ -14,18 +14,13 @@ bug_filing_threshold {
 }
 clustering {
   test_name_rules {
-    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}%"
+    name: "Tast Tests"
+    pattern: "^tast\\.(?P<suite>([^.]+))\\.(?P<testname>([^.]+))\\..*$"
+    like_template: "tast.${suite}.${testname}.%"
   }
 }
 monorail {
-  project: "webrtc"
+  project: "chromium"
   default_field_values {
     # Type field.
     field_id: 10
@@ -71,53 +66,6 @@ monorail {
   }
   priority_hysteresis_percent: 50
   monorail_hostname: "bugs.chromium.org"
-  display_prefix: "bugs.webrtc.org"
+  display_prefix: "crbug.com"
 }
 
-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
-      }
-    }
-  }
-}