From 2fc8c1f7e76997bcdbba77538183e34d53386b08 Mon Sep 17 00:00:00 2001 From: Christoffer Jansson Date: Tue, 30 Aug 2022 14:14:28 +0200 Subject: [PATCH] Update weetbix to its product name Also remove the dev instance config, no real need for it. Bug: None Change-Id: I10b90852e14cdb00f150a449c211bfe931a71b6f Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/273487 Reviewed-by: Jeremy Leconte Commit-Queue: Christoffer Jansson Cr-Commit-Position: refs/heads/main@{#38034} --- infra/config/chops-weetbix-dev.cfg | 123 ------------------ infra/config/config.star | 23 ++-- .../{chops-weetbix.cfg => luci-analysis.cfg} | 2 +- infra/config/realms.cfg | 20 +-- 4 files changed, 24 insertions(+), 144 deletions(-) delete mode 100644 infra/config/chops-weetbix-dev.cfg rename infra/config/{chops-weetbix.cfg => luci-analysis.cfg} (97%) diff --git a/infra/config/chops-weetbix-dev.cfg b/infra/config/chops-weetbix-dev.cfg deleted file mode 100644 index e19bd0fca2..0000000000 --- a/infra/config/chops-weetbix-dev.cfg +++ /dev/null @@ -1,123 +0,0 @@ -# Schema for this config file: ProjectConfig in: -# https://luci-config.appspot.com/schemas/projects:chops-weetbix.cfg -bug_filing_threshold { - presubmit_runs_failed { - # clusters blocking developers should have bugs filed. - one_day: 3 - } - test_runs_failed { - # clusters that aren't blocking developers but are failing a significant - # amount of tasks should have bugs filed to look into optimizing machine - # resource usage. - one_day: 500 - } -} -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}%" - } -} -monorail { - project: "webrtc" - default_field_values { - # Type field. - field_id: 10 - value: "Bug" - } - priority_field_id: 11 - priorities { - priority: "0" - threshold { - presubmit_runs_failed { - one_day: 20 - } - } - } - priorities { - priority: "1" - threshold { - presubmit_runs_failed { - one_day: 10 - } - } - } - priorities { - priority: "2" - threshold { - presubmit_runs_failed { - one_day: 2 - } - } - } - priorities { - priority: "3" - threshold { - # Clusters which fail to meet this threshold will be closed. - test_runs_failed { - one_day: 2 - } - presubmit_runs_failed { - one_day: 1 - seven_day: 1 - } - } - } - 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_dev" - 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_dev" - table: "try_flaky_test_variants" - } - predicate { - status: FLAKY - } - } - } -} diff --git a/infra/config/config.star b/infra/config/config.star index b246006e56..9b849390ac 100755 --- a/infra/config/config.star +++ b/infra/config/config.star @@ -76,8 +76,7 @@ luci.builder.defaults.test_presentation.set( lucicfg.config( config_dir = ".", tracked_files = [ - "chops-weetbix-dev.cfg", - "chops-weetbix.cfg", + "luci-analysis.cfg", "commit-queue.cfg", "cr-buildbucket.cfg", "luci-logdog.cfg", @@ -130,12 +129,17 @@ luci.project( "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", ], ), + # Roles for LUCI Analysis. luci.binding( - roles = "role/weetbix.queryUser", - groups = "googlers", + roles = "role/analysis.reader", + groups = "all", ), luci.binding( - roles = "role/weetbix.editor", + roles = "role/analysis.queryUser", + groups = "authenticated-users", + ), + luci.binding( + roles = "role/analysis.editor", groups = "googlers", ), ], @@ -153,13 +157,8 @@ luci.milo( ################################################################################ lucicfg.emit( - dest = "chops-weetbix-dev.cfg", - data = io.read_file("chops-weetbix-dev.cfg"), -) - -lucicfg.emit( - dest = "chops-weetbix.cfg", - data = io.read_file("chops-weetbix.cfg"), + dest = "luci-analysis.cfg", + data = io.read_file("luci-analysis.cfg"), ) ################################################################################ diff --git a/infra/config/chops-weetbix.cfg b/infra/config/luci-analysis.cfg similarity index 97% rename from infra/config/chops-weetbix.cfg rename to infra/config/luci-analysis.cfg index d0c70aba45..fbcbbcf3b6 100644 --- a/infra/config/chops-weetbix.cfg +++ b/infra/config/luci-analysis.cfg @@ -1,5 +1,5 @@ # Schema for this config file: ProjectConfig in: -# https://luci-config.appspot.com/schemas/projects:chops-weetbix.cfg +# https://luci-config.appspot.com/schemas/projects:luci-analysis.cfg bug_filing_threshold { presubmit_runs_failed { # clusters blocking developers should have bugs filed. diff --git a/infra/config/realms.cfg b/infra/config/realms.cfg index ba87dd5c46..5e05e28ee9 100644 --- a/infra/config/realms.cfg +++ b/infra/config/realms.cfg @@ -6,6 +6,18 @@ realms { name: "@root" + bindings { + role: "role/analysis.editor" + principals: "group:googlers" + } + bindings { + role: "role/analysis.queryUser" + principals: "group:authenticated-users" + } + bindings { + role: "role/analysis.reader" + principals: "group:all" + } bindings { role: "role/buildbucket.reader" principals: "group:all" @@ -54,14 +66,6 @@ realms { role: "role/swarming.taskTriggerer" principals: "group:project-webrtc-admins" } - bindings { - role: "role/weetbix.editor" - principals: "group:googlers" - } - bindings { - role: "role/weetbix.queryUser" - principals: "group:googlers" - } } realms { name: "ci"