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[\\w/]+:\\w+)/(\\w+/)?(?P\\w+)/\\w+\\.(?P\\w+)$" - like_template: "ninja:${target}/%${suite}/%.${case}" - } - test_name_rules { - name: "Google Test (Value-parameterized)" - pattern: "^ninja:(?P[\\w/]+:\\w+)/(\\w+/)?(?P\\w+)\\.(?P\\w+)/[\\w.]+$" - like_template: "ninja:${target}/%${suite}.${case}%" + name: "Tast Tests" + pattern: "^tast\\.(?P([^.]+))\\.(?P([^.]+))\\..*$" + 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[\\w/]+:\\w+)/(\\w+/)?(?P\\w+)/\\w+\\.(?P\\w+)$" - like_template: "ninja:${target}/%${suite}/%.${case}" - } - test_name_rules { - name: "Google Test (Value-parameterized)" - pattern: "^ninja:(?P[\\w/]+:\\w+)/(\\w+/)?(?P\\w+)\\.(?P\\w+)/[\\w.]+$" - like_template: "ninja:${target}/%${suite}.${case}%" + name: "Tast Tests" + pattern: "^tast\\.(?P([^.]+))\\.(?P([^.]+))\\..*$" + 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 - } - } - } -}