6f38450cab71717b98503f30d8948c7476dc8015 - chromium/src

[jonath...@google.com]

commit 6f38450cab71717b98503f30d8948c7476dc8015
Author: Jonathan Lee <jonath...@google.com>
AuthorDate: Wed Mar 02 00:43:09 2022
Commit: Chromium LUCI CQ <chromiu...@luci-project-accounts.iam.gserviceaccount.com>
CommitDate: Wed Mar 02 00:43:09 2022

Correctly categorize WPT builders for chromium.android.fyi

WPT builders are explicitly labeled as such. Target, Android version,
and architecture are also standardized.

Bug: 1299617
Change-Id: I9667f5e19a5dfe54b3b25e092126a5c9ec68eb70
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3499081
Reviewed-by: Weizhong Xia <weiz...@google.com>
Reviewed-by: Haiyang Pan <hy...@google.com>
Commit-Queue: Jonathan Lee <jonath...@google.com>
Cr-Commit-Position: refs/heads/main@{#976487}

diff --git a/infra/config/generated/luci/luci-milo.cfg b/infra/config/generated/luci/luci-milo.cfg
index b6d28eb0..c82f3ee 100644
--- a/infra/config/generated/luci/luci-milo.cfg
+++ b/infra/config/generated/luci/luci-milo.cfg
@@ -3653,31 +3653,6 @@
short_name: "x86"
}
builders {
- name: "buildbucket/luci.chromium.ci/android-pie-arm64-wpt-rel-non-cq"
- category: "builder_tester|arm64"
- short_name: "P-WPT"
- }
- builders {
- name: "buildbucket/luci.chromium.ci/android-chrome-pie-x86-wpt-fyi-rel"
- category: "builder_tester|web-platform"
- short_name: "P"
- }
- builders {
- name: "buildbucket/luci.chromium.ci/android-weblayer-pie-x86-wpt-fyi-rel"
- category: "builder_tester|weblayer"
- short_name: "P"
- }
- builders {
- name: "buildbucket/luci.chromium.ci/android-weblayer-pie-x86-wpt-smoketest"
- category: "builder_tester|weblayer"
- short_name: "P"
- }
- builders {
- name: "buildbucket/luci.chromium.ci/android-webview-pie-x86-wpt-fyi-rel"
- category: "builder_tester|webview"
- short_name: "P"
- }
- builders {
name: "buildbucket/luci.chromium.ci/android-cronet-x86-dbg-kitkat-tests"
category: "cronet|test"
short_name: "k"
@@ -3732,6 +3707,31 @@
category: "tester|webview"
short_name: "12"
}
+ builders {
+ name: "buildbucket/luci.chromium.ci/android-chrome-pie-x86-wpt-fyi-rel"
+ category: "wpt|chrome"
+ short_name: "p-x86"
+ }
+ builders {
+ name: "buildbucket/luci.chromium.ci/android-weblayer-pie-x86-wpt-fyi-rel"
+ category: "wpt|weblayer"
+ short_name: "p-x86"
+ }
+ builders {
+ name: "buildbucket/luci.chromium.ci/android-weblayer-pie-x86-wpt-smoketest"
+ category: "wpt|weblayer"
+ short_name: "p-x86"
+ }
+ builders {
+ name: "buildbucket/luci.chromium.ci/android-pie-arm64-wpt-rel-non-cq"
+ category: "wpt|webview"
+ short_name: "p-arm64"
+ }
+ builders {
+ name: "buildbucket/luci.chromium.ci/android-webview-pie-x86-wpt-fyi-rel"
+ category: "wpt|webview"
+ short_name: "p-x86"
+ }
header {
oncalls {
name: "Chromium"
diff --git a/infra/config/subprojects/chromium/ci/chromium.android.fyi.star b/infra/config/subprojects/chromium/ci/chromium.android.fyi.star
index 1a6ad001..b37152b0 100644
--- a/infra/config/subprojects/chromium/ci/chromium.android.fyi.star
+++ b/infra/config/subprojects/chromium/ci/chromium.android.fyi.star
@@ -42,8 +42,8 @@
ci.builder(
name = "android-pie-arm64-wpt-rel-non-cq",
console_view_entry = consoles.console_view_entry(
- category = "builder_tester|arm64",
- short_name = "P-WPT",
+ category = "wpt|webview",
+ short_name = "p-arm64",
),
goma_backend = None,
reclient_jobs = rbe_jobs.DEFAULT,
@@ -53,8 +53,8 @@
ci.builder(
name = "android-chrome-pie-x86-wpt-fyi-rel",
console_view_entry = consoles.console_view_entry(
- category = "builder_tester|web-platform",
- short_name = "P",
+ category = "wpt|chrome",
+ short_name = "p-x86",
),
goma_backend = None,
reclient_jobs = rbe_jobs.DEFAULT,
@@ -74,8 +74,8 @@
ci.builder(
name = "android-weblayer-pie-x86-wpt-fyi-rel",
console_view_entry = consoles.console_view_entry(
- category = "builder_tester|weblayer",
- short_name = "P",
+ category = "wpt|weblayer",
+ short_name = "p-x86",
),
goma_backend = None,
reclient_jobs = rbe_jobs.DEFAULT,
@@ -85,8 +85,8 @@
ci.builder(
name = "android-weblayer-pie-x86-wpt-smoketest",
console_view_entry = consoles.console_view_entry(
- category = "builder_tester|weblayer",
- short_name = "P",
+ category = "wpt|weblayer",
+ short_name = "p-x86",
),
goma_backend = None,
reclient_jobs = rbe_jobs.DEFAULT,
@@ -96,8 +96,8 @@
ci.builder(
name = "android-webview-pie-x86-wpt-fyi-rel",
console_view_entry = consoles.console_view_entry(
- category = "builder_tester|webview",
- short_name = "P",
+ category = "wpt|webview",
+ short_name = "p-x86",
),
goma_backend = None,
reclient_jobs = rbe_jobs.DEFAULT,