Skip to content

Commit

Permalink
infra: Add ANGLE sheriff rotation to ANGLE bots.
Browse files Browse the repository at this point in the history 
This should allow chromium.angle bot failures to show up in
Sheriff-o-Matic.

Bug: 1288021
Change-Id: I747ffd2bdaf150f5b0ae350381c6dbaedcbc0096
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3785107
Reviewed-by: Erik Staab <estaab@chromium.org>
Commit-Queue: Yuly Novikov <ynovikov@chromium.org>
Reviewed-by: Yuly Novikov <ynovikov@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1028238}
  • Loading branch information
@null77
null77 authored and Chromium LUCI CQ committed Jul 26, 2022
1 parent f23a14e commit 69859ac
Show file tree
Hide file tree
Showing 6 changed files with 135 additions and 23 deletions.
113 changes: 91 additions & 22 deletions infra/config/generated/luci/cr-buildbucket.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23543,7 +23543,10 @@ buckets {
' },'
' "builder_group": "chromium.angle",'
' "perf_dashboard_machine_group": "ChromiumANGLE",'
' "recipe": "angle_chromium"'
' "recipe": "angle_chromium",'
' "sheriff_rotations": ['
' "angle"'
' ]'
'}'
execution_timeout_secs: 10800
build_numbers: YES
Expand Down Expand Up @@ -23611,7 +23614,10 @@ buckets {
' },'
' "builder_group": "chromium.angle",'
' "perf_dashboard_machine_group": "ChromiumANGLE",'
' "recipe": "angle_chromium"'
' "recipe": "angle_chromium",'
' "sheriff_rotations": ['
' "angle"'
' ]'
'}'
execution_timeout_secs: 10800
build_numbers: YES
Expand Down Expand Up @@ -23684,7 +23690,10 @@ buckets {
' },'
' "builder_group": "chromium.angle",'
' "perf_dashboard_machine_group": "ChromiumANGLE",'
' "recipe": "angle_chromium"'
' "recipe": "angle_chromium",'
' "sheriff_rotations": ['
' "angle"'
' ]'
'}'
execution_timeout_secs: 10800
build_numbers: YES
Expand Down Expand Up @@ -23752,7 +23761,10 @@ buckets {
' },'
' "builder_group": "chromium.angle",'
' "perf_dashboard_machine_group": "ChromiumANGLE",'
' "recipe": "angle_chromium"'
' "recipe": "angle_chromium",'
' "sheriff_rotations": ['
' "angle"'
' ]'
'}'
execution_timeout_secs: 10800
build_numbers: YES
Expand Down Expand Up @@ -30209,7 +30221,10 @@ buckets {
' },'
' "builder_group": "chromium.angle",'
' "perf_dashboard_machine_group": "ChromiumANGLE",'
' "recipe": "angle_chromium"'
' "recipe": "angle_chromium",'
' "sheriff_rotations": ['
' "angle"'
' ]'
'}'
execution_timeout_secs: 10800
build_numbers: YES
Expand Down Expand Up @@ -31746,6 +31761,9 @@ buckets {
' "builder_group": "chromium.angle",'
' "perf_dashboard_machine_group": "ChromiumANGLE",'
' "recipe": "angle_chromium",'
' "sheriff_rotations": ['
' "angle"'
' ],'
' "xcode_build_version": "13c100"'
'}'
execution_timeout_secs: 10800
Expand Down Expand Up @@ -31818,7 +31836,10 @@ buckets {
' },'
' "builder_group": "chromium.angle",'
' "perf_dashboard_machine_group": "ChromiumANGLE",'
' "recipe": "angle_chromium"'
' "recipe": "angle_chromium",'
' "sheriff_rotations": ['
' "angle"'
' ]'
'}'
execution_timeout_secs: 10800
build_numbers: YES
Expand Down Expand Up @@ -34431,7 +34452,10 @@ buckets {
' },'
' "builder_group": "chromium.angle",'
' "perf_dashboard_machine_group": "ChromiumANGLE",'
' "recipe": "angle_chromium"'
' "recipe": "angle_chromium",'
' "sheriff_rotations": ['
' "angle"'
' ]'
'}'
execution_timeout_secs: 10800
build_numbers: YES
Expand Down Expand Up @@ -34504,7 +34528,10 @@ buckets {
' },'
' "builder_group": "chromium.angle",'
' "perf_dashboard_machine_group": "ChromiumANGLE",'
' "recipe": "angle_chromium"'
' "recipe": "angle_chromium",'
' "sheriff_rotations": ['
' "angle"'
' ]'
'}'
execution_timeout_secs: 10800
build_numbers: YES
Expand Down Expand Up @@ -34572,7 +34599,10 @@ buckets {
' },'
' "builder_group": "chromium.angle",'
' "perf_dashboard_machine_group": "ChromiumANGLE",'
' "recipe": "angle_chromium"'
' "recipe": "angle_chromium",'
' "sheriff_rotations": ['
' "angle"'
' ]'
'}'
execution_timeout_secs: 10800
build_numbers: YES
Expand Down Expand Up @@ -34640,7 +34670,10 @@ buckets {
' },'
' "builder_group": "chromium.angle",'
' "perf_dashboard_machine_group": "ChromiumANGLE",'
' "recipe": "angle_chromium"'
' "recipe": "angle_chromium",'
' "sheriff_rotations": ['
' "angle"'
' ]'
'}'
execution_timeout_secs: 10800
build_numbers: YES
Expand Down Expand Up @@ -34708,7 +34741,10 @@ buckets {
' },'
' "builder_group": "chromium.angle",'
' "perf_dashboard_machine_group": "ChromiumANGLE",'
' "recipe": "angle_chromium"'
' "recipe": "angle_chromium",'
' "sheriff_rotations": ['
' "angle"'
' ]'
'}'
execution_timeout_secs: 10800
build_numbers: YES
Expand Down Expand Up @@ -34776,7 +34812,10 @@ buckets {
' },'
' "builder_group": "chromium.angle",'
' "perf_dashboard_machine_group": "ChromiumANGLE",'
' "recipe": "angle_chromium"'
' "recipe": "angle_chromium",'
' "sheriff_rotations": ['
' "angle"'
' ]'
'}'
execution_timeout_secs: 10800
build_numbers: YES
Expand Down Expand Up @@ -38730,7 +38769,10 @@ buckets {
' },'
' "builder_group": "chromium.angle",'
' "perf_dashboard_machine_group": "ChromiumANGLE",'
' "recipe": "angle_chromium"'
' "recipe": "angle_chromium",'
' "sheriff_rotations": ['
' "angle"'
' ]'
'}'
execution_timeout_secs: 10800
build_numbers: YES
Expand Down Expand Up @@ -38801,7 +38843,10 @@ buckets {
' },'
' "builder_group": "chromium.angle",'
' "perf_dashboard_machine_group": "ChromiumANGLE",'
' "recipe": "angle_chromium"'
' "recipe": "angle_chromium",'
' "sheriff_rotations": ['
' "angle"'
' ]'
'}'
execution_timeout_secs: 10800
build_numbers: YES
Expand Down Expand Up @@ -38869,7 +38914,10 @@ buckets {
' },'
' "builder_group": "chromium.angle",'
' "perf_dashboard_machine_group": "ChromiumANGLE",'
' "recipe": "angle_chromium"'
' "recipe": "angle_chromium",'
' "sheriff_rotations": ['
' "angle"'
' ]'
'}'
execution_timeout_secs: 10800
build_numbers: YES
Expand Down Expand Up @@ -41699,7 +41747,10 @@ buckets {
' },'
' "builder_group": "chromium.angle",'
' "perf_dashboard_machine_group": "ChromiumANGLE",'
' "recipe": "angle_chromium"'
' "recipe": "angle_chromium",'
' "sheriff_rotations": ['
' "angle"'
' ]'
'}'
execution_timeout_secs: 10800
build_numbers: YES
Expand Down Expand Up @@ -41772,7 +41823,10 @@ buckets {
' },'
' "builder_group": "chromium.angle",'
' "perf_dashboard_machine_group": "ChromiumANGLE",'
' "recipe": "angle_chromium"'
' "recipe": "angle_chromium",'
' "sheriff_rotations": ['
' "angle"'
' ]'
'}'
execution_timeout_secs: 10800
build_numbers: YES
Expand Down Expand Up @@ -41845,7 +41899,10 @@ buckets {
' },'
' "builder_group": "chromium.angle",'
' "perf_dashboard_machine_group": "ChromiumANGLE",'
' "recipe": "angle_chromium"'
' "recipe": "angle_chromium",'
' "sheriff_rotations": ['
' "angle"'
' ]'
'}'
execution_timeout_secs: 10800
build_numbers: YES
Expand Down Expand Up @@ -43342,7 +43399,10 @@ buckets {
' },'
' "builder_group": "chromium.angle",'
' "perf_dashboard_machine_group": "ChromiumANGLE",'
' "recipe": "angle_chromium"'
' "recipe": "angle_chromium",'
' "sheriff_rotations": ['
' "angle"'
' ]'
'}'
execution_timeout_secs: 10800
build_numbers: YES
Expand Down Expand Up @@ -43410,7 +43470,10 @@ buckets {
' },'
' "builder_group": "chromium.angle",'
' "perf_dashboard_machine_group": "ChromiumANGLE",'
' "recipe": "angle_chromium"'
' "recipe": "angle_chromium",'
' "sheriff_rotations": ['
' "angle"'
' ]'
'}'
execution_timeout_secs: 10800
build_numbers: YES
Expand Down Expand Up @@ -43478,7 +43541,10 @@ buckets {
' },'
' "builder_group": "chromium.angle",'
' "perf_dashboard_machine_group": "ChromiumANGLE",'
' "recipe": "angle_chromium"'
' "recipe": "angle_chromium",'
' "sheriff_rotations": ['
' "angle"'
' ]'
'}'
execution_timeout_secs: 10800
build_numbers: YES
Expand Down Expand Up @@ -43546,7 +43612,10 @@ buckets {
' },'
' "builder_group": "chromium.angle",'
' "perf_dashboard_machine_group": "ChromiumANGLE",'
' "recipe": "angle_chromium"'
' "recipe": "angle_chromium",'
' "sheriff_rotations": ['
' "angle"'
' ]'
'}'
execution_timeout_secs: 10800
build_numbers: YES
Expand Down
1 change: 1 addition & 0 deletions infra/config/generated/sheriff-rotations/OWNERS
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ set noparent
file://infra/config/groups/sheriff-rotations/CHROMIUM_OWNERS

per-file android.txt=file://infra/config/groups/sheriff-rotations/ANDROID_OWNERS
per-file angle.txt=file://infra/config/groups/sheriff-rotations/ANGLE_OWNERS
per-file chromium.clang.txt=file://infra/config/groups/sheriff-rotations/CHROMIUM_CLANG_OWNERS
per-file chromium.gpu.txt=file://infra/config/groups/sheriff-rotations/CHROMIUM_GPU_OWNERS
per-file chromium.txt=file://infra/config/groups/sheriff-rotations/CHROMIUM_OWNERS
Expand Down
23 changes: 23 additions & 0 deletions infra/config/generated/sheriff-rotations/angle.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
ci/android-angle-arm64-builder
ci/android-angle-arm64-nexus5x
ci/android-angle-chromium-arm64-builder
ci/android-angle-chromium-arm64-nexus5x
ci/fuchsia-angle-builder
ci/ios-angle-builder
ci/ios-angle-intel
ci/linux-angle-builder
ci/linux-angle-chromium-builder
ci/linux-angle-chromium-intel
ci/linux-angle-chromium-nvidia
ci/linux-angle-intel
ci/linux-angle-nvidia
ci/mac-angle-chromium-amd
ci/mac-angle-chromium-builder
ci/mac-angle-chromium-intel
ci/win-angle-chromium-x64-builder
ci/win-angle-chromium-x86-builder
ci/win-angle-x64-builder
ci/win10-angle-chromium-x64-intel
ci/win10-angle-chromium-x64-nvidia
ci/win10-angle-x64-intel
ci/win10-angle-x64-nvidia
17 changes: 17 additions & 0 deletions infra/config/groups/sheriff-rotations/ANGLE_OWNERS
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# @chromium.org email addresses:
geofflang@chromium.org
jmadill@chromium.org
syoussefi@chromium.org
ynovikov@chromium.org

# @google.com email addresses:
abdolrashidi@google.com
cnorthrop@google.com
geofflang@google.com
ianelliott@google.com
jmadill@google.com
jonahr@google.com
romanl@google.com
syoussefi@google.com
ynovikov@google.com
yuxinhu@google.com
1 change: 1 addition & 0 deletions infra/config/lib/builders.star
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,7 @@ def _rotation(name):
# Arbitrary elements can't be added, new rotations must be added in SoM code
sheriff_rotations = struct(
ANDROID = _rotation("android"),
ANGLE = _rotation("angle"),
CHROMIUM = _rotation("chromium"),
FUCHSIA = _rotation("fuchsia"),
CHROMIUM_CLANG = _rotation("chromium.clang"),
Expand Down
3 changes: 2 additions & 1 deletion infra/config/subprojects/chromium/ci/chromium.angle.star
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# found in the LICENSE file.
"""Definitions of builders in the chromium.angle builder group."""

load("//lib/builders.star", "goma", "xcode")
load("//lib/builders.star", "goma", "sheriff_rotations", "xcode")
load("//lib/ci.star", "ci", "rbe_instance", "rbe_jobs")
load("//lib/consoles.star", "consoles")

Expand All @@ -18,6 +18,7 @@ ci.defaults.set(
"perf_dashboard_machine_group": "ChromiumANGLE",
},
service_account = ci.gpu.SERVICE_ACCOUNT,
sheriff_rotations = sheriff_rotations.ANGLE,
thin_tester_cores = 2,
)

Expand Down

0 comments on commit 69859ac

Please sign in to comment.