Skip to content

GitLab

T
tangled
Commit fc1b6659 authored by Garrett Beaty's avatar Garrett Beaty Committed by Commit Bot
Browse files
Options

Switch remaining builders to use builder_group. 

Bug: 1109276
Change-Id: Ie87ad95334d15beb1de8a34c344c4fe9930ce634
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2382194Reviewed-by: default avatarErik Staab <estaab@chromium.org>
Commit-Queue: Garrett Beaty <gbeaty@chromium.org>
Cr-Commit-Position: refs/heads/master@{#802705}
parent dd30c5d1
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 993 additions and 1095 deletions
infra/config/generated/cr-buildbucket.cfg
View file @ fc1b6659
This diff is collapsed.
infra/config/lib/builders.star
View file @ fc1b6659
...@@ -254,8 +254,6 @@ defaults = args.defaults( ...@@ -254,8 +254,6 @@ defaults = args.defaults(
goma_enable_ats = args.COMPUTE, goma_enable_ats = args.COMPUTE,
goma_jobs = None, goma_jobs = None,
goma_use_luci_auth = None, goma_use_luci_auth = None,
# TODO(https://crbug.com/1109276) Remove mastername
mastername = None,
os = None, os = None,
project_trigger_overrides = None, project_trigger_overrides = None,
pool = None, pool = None,
...@@ -290,8 +288,6 @@ def builder( ...@@ -290,8 +288,6 @@ def builder(
cores = args.DEFAULT, cores = args.DEFAULT,
cpu = args.DEFAULT, cpu = args.DEFAULT,
builder_group = args.DEFAULT, builder_group = args.DEFAULT,
# TODO(https://crbug.com/1109276) Remove mastername
mastername = args.DEFAULT,
pool = args.DEFAULT, pool = args.DEFAULT,
ssd = args.DEFAULT, ssd = args.DEFAULT,
bucketed_triggers = args.DEFAULT, bucketed_triggers = args.DEFAULT,
...@@ -348,12 +344,6 @@ def builder( ...@@ -348,12 +344,6 @@ def builder(
False. False.
* builder_group - a string with the group of the builder. Emits a property * builder_group - a string with the group of the builder. Emits a property
of the form 'builder_group:<builder_group>'. By default, considered None. of the form 'builder_group:<builder_group>'. By default, considered None.
* mastername - a string with the group of the builder. Emits a property
of the form 'mastername:<mastername>'. By default, considered None.
Other than the property emitted, should be treated the same as
builder_group. If builder_group is set, mastername is ignored except
that it is treated as an error if both builder_group and mastername are
set and are set to different values.
* cores - an int indicating the number of cores the builder requires for the * cores - an int indicating the number of cores the builder requires for the
machines that run it. Emits a dimension of the form 'cores:<cores>' will machines that run it. Emits a dimension of the form 'cores:<cores>' will
be emitted. By default, considered None. be emitted. By default, considered None.
...@@ -473,14 +463,8 @@ def builder( ...@@ -473,14 +463,8 @@ def builder(
dimensions["cpu"] = cpu dimensions["cpu"] = cpu
builder_group = defaults.get_value("builder_group", builder_group) builder_group = defaults.get_value("builder_group", builder_group)
mastername = defaults.get_value("mastername", mastername)
if builder_group != None and mastername != None and builder_group != mastername:
fail("mastername ({}) does not match builder_group ({})".format(mastername, builder_group))
if builder_group != None: if builder_group != None:
properties["builder_group"] = builder_group properties["builder_group"] = builder_group
elif mastername != None:
properties["mastername"] = mastername
pool = defaults.get_value("pool", pool) pool = defaults.get_value("pool", pool)
if pool: if pool:
......
infra/config/lib/ci.star
View file @ fc1b6659
...@@ -480,11 +480,7 @@ def ci_builder( ...@@ -480,11 +480,7 @@ def ci_builder(
if console_view_entry: if console_view_entry:
console_view = defaults.get_value("console_view", console_view) console_view = defaults.get_value("console_view", console_view)
if console_view == args.COMPUTE: if console_view == args.COMPUTE:
# The builder function guarantees that at most one of builder_group console_view = defaults.get_value_from_kwargs("builder_group", kwargs)
# or mastername is set
builder_group = defaults.get_value_from_kwargs("builder_group", kwargs)
mastername = defaults.get_value_from_kwargs("mastername", kwargs)
console_view = builder_group or mastername
if console_view: if console_view:
add_to_console_view = defaults.get_value( add_to_console_view = defaults.get_value(
...@@ -536,25 +532,25 @@ def android_builder( ...@@ -536,25 +532,25 @@ def android_builder(
**kwargs): **kwargs):
return ci_builder( return ci_builder(
name = name, name = name,
builder_group = "chromium.android",
goma_backend = builders.goma.backend.RBE_PROD, goma_backend = builders.goma.backend.RBE_PROD,
goma_jobs = goma_jobs, goma_jobs = goma_jobs,
mastername = "chromium.android",
**kwargs **kwargs
) )
def android_fyi_builder(*, name, **kwargs): def android_fyi_builder(*, name, **kwargs):
return ci_builder( return ci_builder(
name = name, name = name,
builder_group = "chromium.android.fyi",
goma_backend = builders.goma.backend.RBE_PROD, goma_backend = builders.goma.backend.RBE_PROD,
mastername = "chromium.android.fyi",
**kwargs **kwargs
) )
def chromium_builder(*, name, tree_closing = True, **kwargs): def chromium_builder(*, name, tree_closing = True, **kwargs):
return ci_builder( return ci_builder(
name = name, name = name,
builder_group = "chromium",
goma_backend = builders.goma.backend.RBE_PROD, goma_backend = builders.goma.backend.RBE_PROD,
mastername = "chromium",
tree_closing = tree_closing, tree_closing = tree_closing,
**kwargs **kwargs
) )
...@@ -562,7 +558,7 @@ def chromium_builder(*, name, tree_closing = True, **kwargs): ...@@ -562,7 +558,7 @@ def chromium_builder(*, name, tree_closing = True, **kwargs):
def chromiumos_builder(*, name, tree_closing = True, **kwargs): def chromiumos_builder(*, name, tree_closing = True, **kwargs):
return ci_builder( return ci_builder(
name = name, name = name,
mastername = "chromium.chromiumos", builder_group = "chromium.chromiumos",
goma_backend = builders.goma.backend.RBE_PROD, goma_backend = builders.goma.backend.RBE_PROD,
tree_closing = tree_closing, tree_closing = tree_closing,
**kwargs **kwargs
...@@ -575,13 +571,13 @@ def clang_builder(*, name, builderless = True, cores = 32, properties = None, ** ...@@ -575,13 +571,13 @@ def clang_builder(*, name, builderless = True, cores = 32, properties = None, **
}) })
return ci_builder( return ci_builder(
name = name, name = name,
builder_group = "chromium.clang",
builderless = builderless, builderless = builderless,
cores = cores, cores = cores,
# Because these run ToT Clang, goma is not used. # Because these run ToT Clang, goma is not used.
# Naturally the runtime will be ~4-8h on average, depending on config. # Naturally the runtime will be ~4-8h on average, depending on config.
# CFI builds will take even longer - around 11h. # CFI builds will take even longer - around 11h.
execution_timeout = 12 * time.hour, execution_timeout = 12 * time.hour,
mastername = "chromium.clang",
properties = properties, properties = properties,
**kwargs **kwargs
) )
...@@ -601,9 +597,9 @@ def clang_mac_builder(*, name, cores = 24, **kwargs): ...@@ -601,9 +597,9 @@ def clang_mac_builder(*, name, cores = 24, **kwargs):
def dawn_builder(*, name, builderless = True, **kwargs): def dawn_builder(*, name, builderless = True, **kwargs):
return ci.builder( return ci.builder(
name = name, name = name,
builder_group = "chromium.dawn",
builderless = builderless, builderless = builderless,
goma_backend = builders.goma.backend.RBE_PROD, goma_backend = builders.goma.backend.RBE_PROD,
mastername = "chromium.dawn",
service_account = service_account =
"chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com", "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com",
**kwargs **kwargs
...@@ -612,8 +608,8 @@ def dawn_builder(*, name, builderless = True, **kwargs): ...@@ -612,8 +608,8 @@ def dawn_builder(*, name, builderless = True, **kwargs):
def fuzz_builder(*, name, **kwargs): def fuzz_builder(*, name, **kwargs):
return ci.builder( return ci.builder(
name = name, name = name,
builder_group = "chromium.fuzz",
goma_backend = builders.goma.backend.RBE_PROD, goma_backend = builders.goma.backend.RBE_PROD,
mastername = "chromium.fuzz",
notifies = ["chromesec-lkgr-failures"], notifies = ["chromesec-lkgr-failures"],
**kwargs **kwargs
) )
...@@ -633,16 +629,16 @@ def fyi_builder( ...@@ -633,16 +629,16 @@ def fyi_builder(
**kwargs): **kwargs):
return ci.builder( return ci.builder(
name = name, name = name,
builder_group = "chromium.fyi",
execution_timeout = execution_timeout, execution_timeout = execution_timeout,
goma_backend = goma_backend, goma_backend = goma_backend,
mastername = "chromium.fyi",
**kwargs **kwargs
) )
def fyi_celab_builder(*, name, **kwargs): def fyi_celab_builder(*, name, **kwargs):
return ci.builder( return ci.builder(
name = name, name = name,
mastername = "chromium.fyi", builder_group = "chromium.fyi",
os = builders.os.WINDOWS_ANY, os = builders.os.WINDOWS_ANY,
executable = "recipe:celab", executable = "recipe:celab",
goma_backend = builders.goma.backend.RBE_PROD, goma_backend = builders.goma.backend.RBE_PROD,
...@@ -718,7 +714,7 @@ def fyi_windows_builder( ...@@ -718,7 +714,7 @@ def fyi_windows_builder(
def gpu_fyi_builder(*, name, **kwargs): def gpu_fyi_builder(*, name, **kwargs):
return ci.builder( return ci.builder(
name = name, name = name,
mastername = "chromium.gpu.fyi", builder_group = "chromium.gpu.fyi",
service_account = service_account =
"chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com", "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com",
**kwargs **kwargs
...@@ -778,8 +774,8 @@ def gpu_builder(*, name, tree_closing = True, notifies = None, **kwargs): ...@@ -778,8 +774,8 @@ def gpu_builder(*, name, tree_closing = True, notifies = None, **kwargs):
notifies = (notifies or []) + ["gpu-tree-closer-email"] notifies = (notifies or []) + ["gpu-tree-closer-email"]
return ci.builder( return ci.builder(
name = name, name = name,
builder_group = "chromium.gpu",
goma_backend = builders.goma.backend.RBE_PROD, goma_backend = builders.goma.backend.RBE_PROD,
mastername = "chromium.gpu",
tree_closing = tree_closing, tree_closing = tree_closing,
notifies = notifies, notifies = notifies,
**kwargs **kwargs
...@@ -807,9 +803,9 @@ def linux_builder( ...@@ -807,9 +803,9 @@ def linux_builder(
**kwargs): **kwargs):
return ci.builder( return ci.builder(
name = name, name = name,
builder_group = "chromium.linux",
goma_backend = goma_backend, goma_backend = goma_backend,
goma_jobs = goma_jobs, goma_jobs = goma_jobs,
mastername = "chromium.linux",
tree_closing = tree_closing, tree_closing = tree_closing,
notifies = list(notifies) + (extra_notifies or []), notifies = list(notifies) + (extra_notifies or []),
**kwargs **kwargs
...@@ -825,9 +821,9 @@ def mac_builder( ...@@ -825,9 +821,9 @@ def mac_builder(
**kwargs): **kwargs):
return ci.builder( return ci.builder(
name = name, name = name,
builder_group = "chromium.mac",
cores = cores, cores = cores,
goma_backend = goma_backend, goma_backend = goma_backend,
mastername = "chromium.mac",
os = os, os = os,
tree_closing = tree_closing, tree_closing = tree_closing,
**kwargs **kwargs
...@@ -870,9 +866,9 @@ def memory_builder( ...@@ -870,9 +866,9 @@ def memory_builder(
return ci.builder( return ci.builder(
name = name, name = name,
builder_group = "chromium.memory",
goma_backend = builders.goma.backend.RBE_PROD, goma_backend = builders.goma.backend.RBE_PROD,
goma_jobs = goma_jobs, goma_jobs = goma_jobs,
mastername = "chromium.memory",
notifies = notifies, notifies = notifies,
tree_closing = tree_closing, tree_closing = tree_closing,
**kwargs **kwargs
...@@ -882,8 +878,8 @@ def swangle_builder(*, name, builderless = True, pinned = True, **kwargs): ...@@ -882,8 +878,8 @@ def swangle_builder(*, name, builderless = True, pinned = True, **kwargs):
builder_args = dict(kwargs) builder_args = dict(kwargs)
builder_args.update( builder_args.update(
name = name, name = name,
builder_group = "chromium.swangle",
builderless = builderless, builderless = builderless,
mastername = "chromium.swangle",
service_account = service_account =
"chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com", "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com",
) )
...@@ -927,18 +923,12 @@ def thin_tester( ...@@ -927,18 +923,12 @@ def thin_tester(
*, *,
name, name,
triggered_by, triggered_by,
# TODO(https://crbug.com/1109276) Remove mastername and remove default builder_group,
# for builder_group
builder_group = None,
mastername = None,
tree_closing = True, tree_closing = True,
**kwargs): **kwargs):
if builder_group == None and mastername == None:
fail("One of builder_group or mastername must be set")
return ci.builder( return ci.builder(
name = name, name = name,
builder_group = builder_group, builder_group = builder_group,
mastername = mastername,
triggered_by = triggered_by, triggered_by = triggered_by,
goma_backend = None, goma_backend = None,
tree_closing = tree_closing, tree_closing = tree_closing,
...@@ -953,8 +943,8 @@ def win_builder( ...@@ -953,8 +943,8 @@ def win_builder(
**kwargs): **kwargs):
return ci.builder( return ci.builder(
name = name, name = name,
builder_group = "chromium.win",
goma_backend = builders.goma.backend.RBE_PROD, goma_backend = builders.goma.backend.RBE_PROD,
mastername = "chromium.win",
os = os, os = os,
tree_closing = tree_closing, tree_closing = tree_closing,
**kwargs **kwargs
......
infra/config/lib/try.star
View file @ fc1b6659
...@@ -270,11 +270,7 @@ def try_builder( ...@@ -270,11 +270,7 @@ def try_builder(
if add_to_list_view: if add_to_list_view:
list_view = defaults.get_value("list_view", list_view) list_view = defaults.get_value("list_view", list_view)
if list_view == args.COMPUTE: if list_view == args.COMPUTE:
# The builder function guarantees that at most one of builder_group list_view = defaults.get_value_from_kwargs("builder_group", kwargs)
# or mastername is set
builder_group = defaults.get_value_from_kwargs("builder_group", kwargs)
mastername = defaults.get_value_from_kwargs("mastername", kwargs)
list_view = builder_group or mastername
if list_view: if list_view:
add_to_list_view = defaults.get_value( add_to_list_view = defaults.get_value(
...@@ -297,8 +293,8 @@ def try_builder( ...@@ -297,8 +293,8 @@ def try_builder(
def blink_builder(*, name, goma_backend = None, **kwargs): def blink_builder(*, name, goma_backend = None, **kwargs):
return try_builder( return try_builder(
name = name, name = name,
builder_group = "tryserver.blink",
goma_backend = goma_backend, goma_backend = goma_backend,
mastername = "tryserver.blink",
**kwargs **kwargs
) )
...@@ -321,27 +317,27 @@ def blink_mac_builder( ...@@ -321,27 +317,27 @@ def blink_mac_builder(
def chromium_builder(*, name, **kwargs): def chromium_builder(*, name, **kwargs):
return try_builder( return try_builder(
name = name, name = name,
builder_group = "tryserver.chromium",
builderless = True, builderless = True,
goma_backend = builders.goma.backend.RBE_PROD, goma_backend = builders.goma.backend.RBE_PROD,
mastername = "tryserver.chromium",
**kwargs **kwargs
) )
def chromium_android_builder(*, name, **kwargs): def chromium_android_builder(*, name, **kwargs):
return try_builder( return try_builder(
name = name, name = name,
builder_group = "tryserver.chromium.android",
goma_backend = builders.goma.backend.RBE_PROD, goma_backend = builders.goma.backend.RBE_PROD,
mastername = "tryserver.chromium.android",
**kwargs **kwargs
) )
def chromium_angle_builder(*, name, **kwargs): def chromium_angle_builder(*, name, **kwargs):
return try_builder( return try_builder(
name = name, name = name,
builder_group = "tryserver.chromium.angle",
builderless = False, builderless = False,
goma_backend = builders.goma.backend.RBE_PROD, goma_backend = builders.goma.backend.RBE_PROD,
goma_jobs = builders.goma.jobs.J150, goma_jobs = builders.goma.jobs.J150,
mastername = "tryserver.chromium.angle",
service_account = "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com", service_account = "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com",
**kwargs **kwargs
) )
...@@ -349,7 +345,7 @@ def chromium_angle_builder(*, name, **kwargs): ...@@ -349,7 +345,7 @@ def chromium_angle_builder(*, name, **kwargs):
def chromium_chromiumos_builder(*, name, **kwargs): def chromium_chromiumos_builder(*, name, **kwargs):
return try_builder( return try_builder(
name = name, name = name,
mastername = "tryserver.chromium.chromiumos", builder_group = "tryserver.chromium.chromiumos",
goma_backend = builders.goma.backend.RBE_PROD, goma_backend = builders.goma.backend.RBE_PROD,
**kwargs **kwargs
) )
...@@ -357,10 +353,10 @@ def chromium_chromiumos_builder(*, name, **kwargs): ...@@ -357,10 +353,10 @@ def chromium_chromiumos_builder(*, name, **kwargs):
def chromium_dawn_builder(*, name, **kwargs): def chromium_dawn_builder(*, name, **kwargs):
return try_builder( return try_builder(
name = name, name = name,
builder_group = "tryserver.chromium.dawn",
builderless = False, builderless = False,
cores = None, cores = None,
goma_backend = builders.goma.backend.RBE_PROD, goma_backend = builders.goma.backend.RBE_PROD,
mastername = "tryserver.chromium.dawn",
service_account = "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com", service_account = "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com",
**kwargs **kwargs
) )
...@@ -368,8 +364,8 @@ def chromium_dawn_builder(*, name, **kwargs): ...@@ -368,8 +364,8 @@ def chromium_dawn_builder(*, name, **kwargs):
def chromium_linux_builder(*, name, goma_backend = builders.goma.backend.RBE_PROD, **kwargs): def chromium_linux_builder(*, name, goma_backend = builders.goma.backend.RBE_PROD, **kwargs):
return try_builder( return try_builder(
name = name, name = name,
builder_group = "tryserver.chromium.linux",
goma_backend = goma_backend, goma_backend = goma_backend,
mastername = "tryserver.chromium.linux",
**kwargs **kwargs
) )
...@@ -383,9 +379,9 @@ def chromium_mac_builder( ...@@ -383,9 +379,9 @@ def chromium_mac_builder(
**kwargs): **kwargs):
return try_builder( return try_builder(
name = name, name = name,
builder_group = "tryserver.chromium.mac",
cores = cores, cores = cores,
goma_backend = goma_backend, goma_backend = goma_backend,
mastername = "tryserver.chromium.mac",
os = os, os = os,
builderless = builderless, builderless = builderless,
ssd = True, ssd = True,
...@@ -409,11 +405,11 @@ def chromium_mac_ios_builder( ...@@ -409,11 +405,11 @@ def chromium_mac_ios_builder(
} }
return try_builder( return try_builder(
name = name, name = name,
builder_group = "tryserver.chromium.mac",
caches = caches, caches = caches,
cores = None, cores = None,
executable = executable, executable = executable,
goma_backend = goma_backend, goma_backend = goma_backend,
mastername = "tryserver.chromium.mac",
os = os, os = os,
properties = properties, properties = properties,
**kwargs **kwargs
...@@ -423,8 +419,8 @@ def chromium_swangle_builder(*, name, pinned = True, **kwargs): ...@@ -423,8 +419,8 @@ def chromium_swangle_builder(*, name, pinned = True, **kwargs):
builder_args = dict(kwargs) builder_args = dict(kwargs)
builder_args.update( builder_args.update(
name = name, name = name,
builder_group = "tryserver.chromium.swangle",
builderless = True, builderless = True,
mastername = "tryserver.chromium.swangle",
service_account = "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com", service_account = "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com",
) )
if pinned: if pinned:
...@@ -465,9 +461,9 @@ def chromium_win_builder( ...@@ -465,9 +461,9 @@ def chromium_win_builder(
**kwargs): **kwargs):
return try_builder( return try_builder(
name = name, name = name,
builder_group = "tryserver.chromium.win",
builderless = builderless, builderless = builderless,
goma_backend = goma_backend, goma_backend = goma_backend,
mastername = "tryserver.chromium.win",
os = os, os = os,
**kwargs **kwargs
) )
...@@ -484,25 +480,25 @@ def gpu_try_builder(*, name, builderless = False, execution_timeout = 6 * time.h ...@@ -484,25 +480,25 @@ def gpu_try_builder(*, name, builderless = False, execution_timeout = 6 * time.h
def gpu_chromium_android_builder(*, name, **kwargs): def gpu_chromium_android_builder(*, name, **kwargs):
return gpu_try_builder( return gpu_try_builder(
name = name, name = name,
builder_group = "tryserver.chromium.android",
goma_backend = builders.goma.backend.RBE_PROD, goma_backend = builders.goma.backend.RBE_PROD,
mastername = "tryserver.chromium.android",
**kwargs **kwargs
) )
def gpu_chromium_linux_builder(*, name, **kwargs): def gpu_chromium_linux_builder(*, name, **kwargs):
return gpu_try_builder( return gpu_try_builder(
name = name, name = name,
builder_group = "tryserver.chromium.linux",
goma_backend = builders.goma.backend.RBE_PROD, goma_backend = builders.goma.backend.RBE_PROD,
mastername = "tryserver.chromium.linux",
**kwargs **kwargs
) )
def gpu_chromium_mac_builder(*, name, **kwargs): def gpu_chromium_mac_builder(*, name, **kwargs):
return gpu_try_builder( return gpu_try_builder(
name = name, name = name,
builder_group = "tryserver.chromium.mac",
cores = None, cores = None,
goma_backend = builders.goma.backend.RBE_PROD, goma_backend = builders.goma.backend.RBE_PROD,
mastername = "tryserver.chromium.mac",
os = builders.os.MAC_ANY, os = builders.os.MAC_ANY,
**kwargs **kwargs
) )
...@@ -510,8 +506,8 @@ def gpu_chromium_mac_builder(*, name, **kwargs): ...@@ -510,8 +506,8 @@ def gpu_chromium_mac_builder(*, name, **kwargs):
def gpu_chromium_win_builder(*, name, os = builders.os.WINDOWS_ANY, **kwargs): def gpu_chromium_win_builder(*, name, os = builders.os.WINDOWS_ANY, **kwargs):
return gpu_try_builder( return gpu_try_builder(
name = name, name = name,
builder_group = "tryserver.chromium.win",
goma_backend = builders.goma.backend.RBE_PROD, goma_backend = builders.goma.backend.RBE_PROD,
mastername = "tryserver.chromium.win",
os = os, os = os,
**kwargs **kwargs
) )
......
infra/config/subprojects/chromium/ci.star
View file @ fc1b6659
...@@ -680,9 +680,6 @@ ci.android_builder( ...@@ -680,9 +680,6 @@ ci.android_builder(
ci.android_builder( ci.android_builder(
name = "android-cronet-arm-rel", name = "android-cronet-arm-rel",
branch_selector = branches.STANDARD_RELEASES, branch_selector = branches.STANDARD_RELEASES,
# TODO(https://crbug.com/1109276) Once support for mastername is removed, do
# not explicitly set
builder_group = "chromium.android",
console_view_entry = ci.console_view_entry( console_view_entry = ci.console_view_entry(
category = "cronet|arm", category = "cronet|arm",
short_name = "rel", short_name = "rel",
...@@ -1141,9 +1138,6 @@ ci.chromiumos_builder( ...@@ -1141,9 +1138,6 @@ ci.chromiumos_builder(
ci.chromiumos_builder( ci.chromiumos_builder(
name = "chromeos-amd64-generic-rel", name = "chromeos-amd64-generic-rel",
branch_selector = branches.ALL_RELEASES, branch_selector = branches.ALL_RELEASES,
# TODO(https://crbug.com/1109276) Once support for mastername is removed, do
# not explicitly set
builder_group = "chromium.chromiumos",
console_view_entry = ci.console_view_entry( console_view_entry = ci.console_view_entry(
category = "simple|release|x64", category = "simple|release|x64",
short_name = "rel", short_name = "rel",
...@@ -2871,7 +2865,7 @@ ci.fyi_mac_builder( ...@@ -2871,7 +2865,7 @@ ci.fyi_mac_builder(
ci.thin_tester( ci.thin_tester(
name = "Mac11.0 Tests", name = "Mac11.0 Tests",
mastername = "chromium.fyi", builder_group = "chromium.fyi",
console_view_entry = ci.console_view_entry( console_view_entry = ci.console_view_entry(
category = "mac", category = "mac",
short_name = "11.0", short_name = "11.0",
...@@ -2992,9 +2986,6 @@ ci.gpu_builder( ...@@ -2992,9 +2986,6 @@ ci.gpu_builder(
ci.gpu_builder( ci.gpu_builder(
name = "GPU Linux Builder", name = "GPU Linux Builder",
branch_selector = branches.STANDARD_RELEASES, branch_selector = branches.STANDARD_RELEASES,
# TODO(https://crbug.com/1109276) Once support for mastername is removed, do
# not explicitly set
builder_group = "chromium.gpu",
console_view_entry = ci.console_view_entry( console_view_entry = ci.console_view_entry(
category = "Linux", category = "Linux",
), ),
...@@ -3013,9 +3004,6 @@ ci.gpu_builder( ...@@ -3013,9 +3004,6 @@ ci.gpu_builder(
ci.gpu_builder( ci.gpu_builder(
name = "GPU Mac Builder", name = "GPU Mac Builder",
branch_selector = branches.STANDARD_RELEASES, branch_selector = branches.STANDARD_RELEASES,
# TODO(https://crbug.com/1109276) Once support for mastername is removed, do
# not explicitly set
builder_group = "chromium.gpu",
console_view_entry = ci.console_view_entry( console_view_entry = ci.console_view_entry(
category = "Mac", category = "Mac",
), ),
...@@ -3038,9 +3026,6 @@ ci.gpu_builder( ...@@ -3038,9 +3026,6 @@ ci.gpu_builder(
ci.gpu_builder( ci.gpu_builder(
name = "GPU Win x64 Builder", name = "GPU Win x64 Builder",
branch_selector = branches.STANDARD_RELEASES, branch_selector = branches.STANDARD_RELEASES,
# TODO(https://crbug.com/1109276) Once support for mastername is removed, do
# not explicitly set
builder_group = "chromium.gpu",
builderless = True, builderless = True,
console_view_entry = ci.console_view_entry( console_view_entry = ci.console_view_entry(
category = "Windows", category = "Windows",
...@@ -3072,9 +3057,6 @@ ci.gpu_thin_tester( ...@@ -3072,9 +3057,6 @@ ci.gpu_thin_tester(
ci.gpu_thin_tester( ci.gpu_thin_tester(
name = "Linux Release (NVIDIA)", name = "Linux Release (NVIDIA)",
branch_selector = branches.STANDARD_RELEASES, branch_selector = branches.STANDARD_RELEASES,
# TODO(https://crbug.com/1109276) Once support for mastername is removed, do
# not explicitly set
builder_group = "chromium.gpu",
cq_mirrors_console_view = settings.cq_mirrors_console_name, cq_mirrors_console_view = settings.cq_mirrors_console_name,
console_view_entry = ci.console_view_entry( console_view_entry = ci.console_view_entry(
category = "Linux", category = "Linux",
...@@ -3095,9 +3077,6 @@ ci.gpu_thin_tester( ...@@ -3095,9 +3077,6 @@ ci.gpu_thin_tester(
ci.gpu_thin_tester( ci.gpu_thin_tester(
name = "Mac Release (Intel)", name = "Mac Release (Intel)",
branch_selector = branches.STANDARD_RELEASES, branch_selector = branches.STANDARD_RELEASES,
# TODO(https://crbug.com/1109276) Once support for mastername is removed, do
# not explicitly set
builder_group = "chromium.gpu",
console_view_entry = ci.console_view_entry( console_view_entry = ci.console_view_entry(
category = "Mac", category = "Mac",
), ),
...@@ -3118,9 +3097,6 @@ ci.gpu_thin_tester( ...@@ -3118,9 +3097,6 @@ ci.gpu_thin_tester(
ci.gpu_thin_tester( ci.gpu_thin_tester(
name = "Mac Retina Release (AMD)", name = "Mac Retina Release (AMD)",
branch_selector = branches.STANDARD_RELEASES, branch_selector = branches.STANDARD_RELEASES,
# TODO(https://crbug.com/1109276) Once support for mastername is removed, do
# not explicitly set
builder_group = "chromium.gpu",
console_view_entry = ci.console_view_entry( console_view_entry = ci.console_view_entry(
category = "Mac", category = "Mac",
), ),
...@@ -3141,9 +3117,6 @@ ci.gpu_thin_tester( ...@@ -3141,9 +3117,6 @@ ci.gpu_thin_tester(
ci.gpu_thin_tester( ci.gpu_thin_tester(
name = "Win10 x64 Release (NVIDIA)", name = "Win10 x64 Release (NVIDIA)",
branch_selector = branches.STANDARD_RELEASES, branch_selector = branches.STANDARD_RELEASES,
# TODO(https://crbug.com/1109276) Once support for mastername is removed, do
# not explicitly set
builder_group = "chromium.gpu",
console_view_entry = ci.console_view_entry( console_view_entry = ci.console_view_entry(
category = "Windows", category = "Windows",
), ),
...@@ -3985,9 +3958,6 @@ ci.linux_builder( ...@@ -3985,9 +3958,6 @@ ci.linux_builder(
ci.linux_builder( ci.linux_builder(
name = "Linux Builder", name = "Linux Builder",
branch_selector = branches.STANDARD_RELEASES, branch_selector = branches.STANDARD_RELEASES,
# TODO(https://crbug.com/1109276) Once support for mastername is removed, do
# not explicitly set
builder_group = "chromium.linux",
console_view_entry = ci.console_view_entry( console_view_entry = ci.console_view_entry(
category = "release", category = "release",
short_name = "bld", short_name = "bld",
...@@ -4019,9 +3989,6 @@ ci.linux_builder( ...@@ -4019,9 +3989,6 @@ ci.linux_builder(
ci.linux_builder( ci.linux_builder(
name = "Linux Tests", name = "Linux Tests",
branch_selector = branches.STANDARD_RELEASES, branch_selector = branches.STANDARD_RELEASES,
# TODO(https://crbug.com/1109276) Once support for mastername is removed, do
# not explicitly set
builder_group = "chromium.linux",
console_view_entry = ci.console_view_entry( console_view_entry = ci.console_view_entry(
category = "release", category = "release",
short_name = "tst", short_name = "tst",
...@@ -4072,9 +4039,6 @@ ci.linux_builder( ...@@ -4072,9 +4039,6 @@ ci.linux_builder(
ci.linux_builder( ci.linux_builder(
name = "fuchsia-x64-cast", name = "fuchsia-x64-cast",
branch_selector = branches.STANDARD_RELEASES, branch_selector = branches.STANDARD_RELEASES,
# TODO(https://crbug.com/1109276) Once support for mastername is removed, do
# not explicitly set
builder_group = "chromium.linux",
console_view_entry = ci.console_view_entry( console_view_entry = ci.console_view_entry(
category = "fuchsia|cast", category = "fuchsia|cast",
short_name = "x64", short_name = "x64",
...@@ -4193,9 +4157,6 @@ ci.linux_builder( ...@@ -4193,9 +4157,6 @@ ci.linux_builder(
ci.mac_builder( ci.mac_builder(
name = "Mac Builder", name = "Mac Builder",
branch_selector = branches.STANDARD_RELEASES, branch_selector = branches.STANDARD_RELEASES,
# TODO(https://crbug.com/1109276) Once support for mastername is removed, do
# not explicitly set
builder_group = "chromium.mac",
console_view_entry = ci.console_view_entry( console_view_entry = ci.console_view_entry(
category = "release", category = "release",
short_name = "bld", short_name = "bld",
...@@ -4232,7 +4193,7 @@ ci.mac_builder( ...@@ -4232,7 +4193,7 @@ ci.mac_builder(
ci.thin_tester( ci.thin_tester(
name = "Mac10.10 Tests", name = "Mac10.10 Tests",
branch_selector = branches.STANDARD_RELEASES, branch_selector = branches.STANDARD_RELEASES,
mastername = "chromium.mac", builder_group = "chromium.mac",
console_view_entry = ci.console_view_entry( console_view_entry = ci.console_view_entry(
category = "release", category = "release",
short_name = "10", short_name = "10",
...@@ -4245,7 +4206,7 @@ ci.thin_tester( ...@@ -4245,7 +4206,7 @@ ci.thin_tester(
ci.thin_tester( ci.thin_tester(
name = "Mac10.11 Tests", name = "Mac10.11 Tests",
branch_selector = branches.STANDARD_RELEASES, branch_selector = branches.STANDARD_RELEASES,
mastername = "chromium.mac", builder_group = "chromium.mac",
console_view_entry = ci.console_view_entry( console_view_entry = ci.console_view_entry(
category = "release", category = "release",
short_name = "11", short_name = "11",
...@@ -4258,7 +4219,7 @@ ci.thin_tester( ...@@ -4258,7 +4219,7 @@ ci.thin_tester(
ci.thin_tester( ci.thin_tester(
name = "Mac10.12 Tests", name = "Mac10.12 Tests",
branch_selector = branches.STANDARD_RELEASES, branch_selector = branches.STANDARD_RELEASES,
mastername = "chromium.mac", builder_group = "chromium.mac",
console_view_entry = ci.console_view_entry( console_view_entry = ci.console_view_entry(
category = "release", category = "release",
short_name = "12", short_name = "12",
...@@ -4271,10 +4232,7 @@ ci.thin_tester( ...@@ -4271,10 +4232,7 @@ ci.thin_tester(
ci.thin_tester( ci.thin_tester(
name = "Mac10.13 Tests", name = "Mac10.13 Tests",
branch_selector = branches.STANDARD_RELEASES, branch_selector = branches.STANDARD_RELEASES,
# TODO(https://crbug.com/1109276) Once support for mastername is removed, do
# not explicitly set
builder_group = "chromium.mac", builder_group = "chromium.mac",
mastername = "chromium.mac",
console_view_entry = ci.console_view_entry( console_view_entry = ci.console_view_entry(
category = "release", category = "release",
short_name = "13", short_name = "13",
...@@ -4287,7 +4245,7 @@ ci.thin_tester( ...@@ -4287,7 +4245,7 @@ ci.thin_tester(
ci.thin_tester( ci.thin_tester(
name = "Mac10.14 Tests", name = "Mac10.14 Tests",
branch_selector = branches.STANDARD_RELEASES, branch_selector = branches.STANDARD_RELEASES,
mastername = "chromium.mac", builder_group = "chromium.mac",
console_view_entry = ci.console_view_entry( console_view_entry = ci.console_view_entry(
category = "release", category = "release",
short_name = "14", short_name = "14",
...@@ -4300,7 +4258,7 @@ ci.thin_tester( ...@@ -4300,7 +4258,7 @@ ci.thin_tester(
ci.thin_tester( ci.thin_tester(
name = "Mac10.15 Tests", name = "Mac10.15 Tests",
branch_selector = branches.STANDARD_RELEASES, branch_selector = branches.STANDARD_RELEASES,
mastername = "chromium.mac", builder_group = "chromium.mac",
console_view_entry = ci.console_view_entry( console_view_entry = ci.console_view_entry(
category = "release", category = "release",
short_name = "15", short_name = "15",
...@@ -4313,7 +4271,7 @@ ci.thin_tester( ...@@ -4313,7 +4271,7 @@ ci.thin_tester(
ci.thin_tester( ci.thin_tester(
name = "Mac10.13 Tests (dbg)", name = "Mac10.13 Tests (dbg)",
branch_selector = branches.STANDARD_RELEASES, branch_selector = branches.STANDARD_RELEASES,
mastername = "chromium.mac", builder_group = "chromium.mac",
console_view_entry = ci.console_view_entry( console_view_entry = ci.console_view_entry(
category = "debug", category = "debug",
short_name = "13", short_name = "13",
...@@ -4337,9 +4295,6 @@ ci.mac_ios_builder( ...@@ -4337,9 +4295,6 @@ ci.mac_ios_builder(
ci.mac_ios_builder( ci.mac_ios_builder(
name = "ios-simulator", name = "ios-simulator",
branch_selector = branches.STANDARD_RELEASES, branch_selector = branches.STANDARD_RELEASES,
# TODO(https://crbug.com/1109276) Once support for mastername is removed, do
# not explicitly set
builder_group = "chromium.mac",
console_view_entry = ci.console_view_entry( console_view_entry = ci.console_view_entry(
category = "ios|default", category = "ios|default",
short_name = "sim", short_name = "sim",
...@@ -4839,9 +4794,6 @@ ci.win_builder( ...@@ -4839,9 +4794,6 @@ ci.win_builder(
ci.win_builder( ci.win_builder(
name = "Win x64 Builder", name = "Win x64 Builder",
branch_selector = branches.STANDARD_RELEASES, branch_selector = branches.STANDARD_RELEASES,
# TODO(https://crbug.com/1109276) Once support for mastername is removed, do
# not explicitly set
builder_group = "chromium.win",
console_view_entry = ci.console_view_entry( console_view_entry = ci.console_view_entry(
category = "release|builder", category = "release|builder",
short_name = "64", short_name = "64",
...@@ -4855,9 +4807,6 @@ ci.win_builder( ...@@ -4855,9 +4807,6 @@ ci.win_builder(
ci.win_builder( ci.win_builder(
name = "Win10 Tests x64", name = "Win10 Tests x64",
branch_selector = branches.STANDARD_RELEASES, branch_selector = branches.STANDARD_RELEASES,
# TODO(https://crbug.com/1109276) Once support for mastername is removed, do
# not explicitly set
builder_group = "chromium.win",
console_view_entry = ci.console_view_entry( console_view_entry = ci.console_view_entry(
category = "release|tester", category = "release|tester",
short_name = "w10", short_name = "w10",
......
infra/config/subprojects/chromium/gpu.try.star
View file @ fc1b6659
...@@ -17,19 +17,19 @@ try_.set_defaults( ...@@ -17,19 +17,19 @@ try_.set_defaults(
# Builder functions are defined in lexicographic order by name ignoring the # Builder functions are defined in lexicographic order by name ignoring the
# '_builder' suffix # '_builder' suffix
# Builder functions are defined for GPU builders on each master where they # Builder functions are defined for GPU builders in each builder group where
# appear: gpu_XXX_builder where XXX is the part after the last dot in the # they appear: gpu_XXX_builder where XXX is the part after the last dot in the
# mastername # builder group
# Builder functions are defined for each master, with additional functions # Builder functions are defined for each builder group, with additional
# for specializing on OS: XXX_builder and XXX_YYY_builder where XXX is the part # functions for specializing on OS: XXX_builder and XXX_YYY_builder where XXX is
# after the last dot in the mastername and YYY is the OS # the part after the last dot in the builder group and YYY is the OS
def gpu_android_builder(*, name, **kwargs): def gpu_android_builder(*, name, **kwargs):
return try_.builder( return try_.builder(
name = name, name = name,
builder_group = "tryserver.chromium.android",
builderless = True, builderless = True,
goma_backend = goma.backend.RBE_PROD, goma_backend = goma.backend.RBE_PROD,
mastername = "tryserver.chromium.android",
ssd = None, ssd = None,
**kwargs **kwargs
) )
...@@ -112,9 +112,9 @@ gpu_android_builder( ...@@ -112,9 +112,9 @@ gpu_android_builder(
def gpu_chromeos_builder(*, name, **kwargs): def gpu_chromeos_builder(*, name, **kwargs):
return try_.builder( return try_.builder(
name = name, name = name,
builder_group = "tryserver.chromium.chromiumos",
builderless = True, builderless = True,
goma_backend = goma.backend.RBE_PROD, goma_backend = goma.backend.RBE_PROD,
mastername = "tryserver.chromium.chromiumos",
ssd = None, ssd = None,
**kwargs **kwargs
) )
...@@ -132,9 +132,9 @@ gpu_chromeos_builder( ...@@ -132,9 +132,9 @@ gpu_chromeos_builder(
def gpu_linux_builder(*, name, **kwargs): def gpu_linux_builder(*, name, **kwargs):
return try_.builder( return try_.builder(
name = name, name = name,
builder_group = "tryserver.chromium.linux",
builderless = True, builderless = True,
goma_backend = goma.backend.RBE_PROD, goma_backend = goma.backend.RBE_PROD,
mastername = "tryserver.chromium.linux",
ssd = None, ssd = None,
**kwargs **kwargs
) )
...@@ -207,10 +207,10 @@ gpu_linux_builder( ...@@ -207,10 +207,10 @@ gpu_linux_builder(
def gpu_mac_builder(*, name, **kwargs): def gpu_mac_builder(*, name, **kwargs):
return try_.builder( return try_.builder(
name = name, name = name,
builder_group = "tryserver.chromium.mac",
builderless = True, builderless = True,
cores = None, cores = None,
goma_backend = goma.backend.RBE_PROD, goma_backend = goma.backend.RBE_PROD,
mastername = "tryserver.chromium.mac",
os = os.MAC_ANY, os = os.MAC_ANY,
ssd = None, ssd = None,
**kwargs **kwargs
...@@ -305,9 +305,9 @@ gpu_mac_builder( ...@@ -305,9 +305,9 @@ gpu_mac_builder(
def gpu_win_builder(*, name, **kwargs): def gpu_win_builder(*, name, **kwargs):
return try_.builder( return try_.builder(
name = name, name = name,
builder_group = "tryserver.chromium.win",
builderless = True, builderless = True,
goma_backend = goma.backend.RBE_PROD, goma_backend = goma.backend.RBE_PROD,
mastername = "tryserver.chromium.win",
os = os.WINDOWS_ANY, os = os.WINDOWS_ANY,
ssd = None, ssd = None,
**kwargs **kwargs
......
infra/config/subprojects/chromium/try.star
View file @ fc1b6659
...@@ -423,9 +423,6 @@ try_.chromium_android_builder( ...@@ -423,9 +423,6 @@ try_.chromium_android_builder(
try_.chromium_android_builder( try_.chromium_android_builder(
name = "android_cronet", name = "android_cronet",
branch_selector = branches.STANDARD_RELEASES, branch_selector = branches.STANDARD_RELEASES,
# TODO(https://crbug.com/1109276) Once support for mastername is removed, do
# not explicitly set
builder_group = "tryserver.chromium.android",
main_list_view = settings.main_list_view_name, main_list_view = settings.main_list_view_name,
tryjob = try_.job(), tryjob = try_.job(),
) )
...@@ -542,9 +539,6 @@ try_.chromium_chromiumos_builder( ...@@ -542,9 +539,6 @@ try_.chromium_chromiumos_builder(
try_.chromium_chromiumos_builder( try_.chromium_chromiumos_builder(
name = "chromeos-amd64-generic-rel", name = "chromeos-amd64-generic-rel",
branch_selector = branches.ALL_RELEASES, branch_selector = branches.ALL_RELEASES,
# TODO(https://crbug.com/1109276) Once support for mastername is removed, do
# not explicitly set
builder_group = "tryserver.chromium.chromiumos",
main_list_view = settings.main_list_view_name, main_list_view = settings.main_list_view_name,
tryjob = try_.job(), tryjob = try_.job(),
) )
...@@ -785,9 +779,6 @@ try_.chromium_linux_builder( ...@@ -785,9 +779,6 @@ try_.chromium_linux_builder(
try_.chromium_linux_builder( try_.chromium_linux_builder(
name = "fuchsia-x64-cast", name = "fuchsia-x64-cast",
branch_selector = branches.STANDARD_RELEASES, branch_selector = branches.STANDARD_RELEASES,
# TODO(https://crbug.com/1109276) Once support for mastername is removed, do
# not explicitly set
builder_group = "tryserver.chromium.linux",
main_list_view = settings.main_list_view_name, main_list_view = settings.main_list_view_name,
tryjob = try_.job(), tryjob = try_.job(),
) )
...@@ -899,9 +890,6 @@ try_.chromium_linux_builder( ...@@ -899,9 +890,6 @@ try_.chromium_linux_builder(
try_.chromium_linux_builder( try_.chromium_linux_builder(
name = "linux-rel", name = "linux-rel",
branch_selector = branches.STANDARD_RELEASES, branch_selector = branches.STANDARD_RELEASES,
# TODO(https://crbug.com/1109276) Once support for mastername is removed, do
# not explicitly set
builder_group = "tryserver.chromium.linux",
goma_jobs = goma.jobs.J150, goma_jobs = goma.jobs.J150,
main_list_view = settings.main_list_view_name, main_list_view = settings.main_list_view_name,
tryjob = try_.job(), tryjob = try_.job(),
...@@ -1107,9 +1095,6 @@ try_.chromium_mac_builder( ...@@ -1107,9 +1095,6 @@ try_.chromium_mac_builder(
try_.chromium_mac_builder( try_.chromium_mac_builder(
name = "mac-rel", name = "mac-rel",
# TODO(https://crbug.com/1109276) Once support for mastername is removed, do
# not explicitly set
builder_group = "tryserver.chromium.mac",
branch_selector = branches.STANDARD_RELEASES, branch_selector = branches.STANDARD_RELEASES,
goma_jobs = goma.jobs.J150, goma_jobs = goma.jobs.J150,
main_list_view = settings.main_list_view_name, main_list_view = settings.main_list_view_name,
...@@ -1205,9 +1190,6 @@ try_.chromium_mac_ios_builder( ...@@ -1205,9 +1190,6 @@ try_.chromium_mac_ios_builder(
try_.chromium_mac_ios_builder( try_.chromium_mac_ios_builder(
name = "ios-simulator", name = "ios-simulator",
branch_selector = branches.STANDARD_RELEASES, branch_selector = branches.STANDARD_RELEASES,
# TODO(https://crbug.com/1109276) Once support for mastername is removed, do
# not explicitly set
builder_group = "tryserver.chromium.mac",
executable = "recipe:chromium_trybot", executable = "recipe:chromium_trybot",
main_list_view = settings.main_list_view_name, main_list_view = settings.main_list_view_name,
properties = { properties = {
...@@ -1400,9 +1382,6 @@ try_.chromium_win_builder( ...@@ -1400,9 +1382,6 @@ try_.chromium_win_builder(
try_.chromium_win_builder( try_.chromium_win_builder(
name = "win10_chromium_x64_rel_ng", name = "win10_chromium_x64_rel_ng",
branch_selector = branches.STANDARD_RELEASES, branch_selector = branches.STANDARD_RELEASES,
# TODO(https://crbug.com/1109276) Once support for mastername is removed, do
# not explicitly set
builder_group = "tryserver.chromium.win",
goma_jobs = goma.jobs.J150, goma_jobs = goma.jobs.J150,
os = os.WINDOWS_10, os = os.WINDOWS_10,
ssd = True, ssd = True,
......
infra/config/subprojects/chromium/versioned/m85/buckets/ci.star
View file @ fc1b6659
...@@ -649,7 +649,7 @@ ci.mac_builder( ...@@ -649,7 +649,7 @@ ci.mac_builder(
ci.thin_tester( ci.thin_tester(
name = "Mac10.10 Tests", name = "Mac10.10 Tests",
mastername = "chromium.mac", builder_group = "chromium.mac",
console_view_entry = ci.console_view_entry( console_view_entry = ci.console_view_entry(
category = "release", category = "release",
short_name = "10", short_name = "10",
...@@ -659,7 +659,7 @@ ci.thin_tester( ...@@ -659,7 +659,7 @@ ci.thin_tester(
ci.thin_tester( ci.thin_tester(
name = "Mac10.11 Tests", name = "Mac10.11 Tests",
mastername = "chromium.mac", builder_group = "chromium.mac",
console_view_entry = ci.console_view_entry( console_view_entry = ci.console_view_entry(
category = "release", category = "release",
short_name = "11", short_name = "11",
...@@ -669,7 +669,7 @@ ci.thin_tester( ...@@ -669,7 +669,7 @@ ci.thin_tester(
ci.thin_tester( ci.thin_tester(
name = "Mac10.12 Tests", name = "Mac10.12 Tests",
mastername = "chromium.mac", builder_group = "chromium.mac",
console_view_entry = ci.console_view_entry( console_view_entry = ci.console_view_entry(
category = "release", category = "release",
short_name = "12", short_name = "12",
...@@ -679,7 +679,7 @@ ci.thin_tester( ...@@ -679,7 +679,7 @@ ci.thin_tester(
ci.thin_tester( ci.thin_tester(
name = "Mac10.13 Tests", name = "Mac10.13 Tests",
mastername = "chromium.mac", builder_group = "chromium.mac",
console_view_entry = ci.console_view_entry( console_view_entry = ci.console_view_entry(
category = "release", category = "release",
short_name = "13", short_name = "13",
...@@ -689,7 +689,7 @@ ci.thin_tester( ...@@ -689,7 +689,7 @@ ci.thin_tester(
ci.thin_tester( ci.thin_tester(
name = "Mac10.14 Tests", name = "Mac10.14 Tests",
mastername = "chromium.mac", builder_group = "chromium.mac",
console_view_entry = ci.console_view_entry( console_view_entry = ci.console_view_entry(
category = "release", category = "release",
short_name = "14", short_name = "14",
...@@ -699,7 +699,7 @@ ci.thin_tester( ...@@ -699,7 +699,7 @@ ci.thin_tester(
ci.thin_tester( ci.thin_tester(
name = "Mac10.15 Tests", name = "Mac10.15 Tests",
mastername = "chromium.mac", builder_group = "chromium.mac",
console_view_entry = ci.console_view_entry( console_view_entry = ci.console_view_entry(
category = "release", category = "release",
short_name = "15", short_name = "15",
...@@ -709,7 +709,7 @@ ci.thin_tester( ...@@ -709,7 +709,7 @@ ci.thin_tester(
ci.thin_tester( ci.thin_tester(
name = "Mac10.13 Tests (dbg)", name = "Mac10.13 Tests (dbg)",
mastername = "chromium.mac", builder_group = "chromium.mac",
console_view_entry = ci.console_view_entry( console_view_entry = ci.console_view_entry(
category = "debug", category = "debug",
short_name = "13", short_name = "13",
......
infra/config/subprojects/codesearch/codesearch.star
View file @ fc1b6659
...@@ -25,6 +25,7 @@ luci.bucket( ...@@ -25,6 +25,7 @@ luci.bucket(
try_.defaults.bucket.set("codesearch") try_.defaults.bucket.set("codesearch")
try_.defaults.build_numbers.set(True) try_.defaults.build_numbers.set(True)
try_.defaults.builder_group.set("tryserver.chromium.codesearch")
try_.defaults.builderless.set(True) try_.defaults.builderless.set(True)
try_.defaults.cores.set(8) try_.defaults.cores.set(8)
try_.defaults.cpu.set(cpu.X86_64) try_.defaults.cpu.set(cpu.X86_64)
...@@ -33,7 +34,6 @@ try_.defaults.executable.set("recipe:chromium_codesearch") ...@@ -33,7 +34,6 @@ try_.defaults.executable.set("recipe:chromium_codesearch")
try_.defaults.execution_timeout.set(9 * time.hour) try_.defaults.execution_timeout.set(9 * time.hour)
try_.defaults.expiration_timeout.set(2 * time.hour) try_.defaults.expiration_timeout.set(2 * time.hour)
try_.defaults.goma_backend.set(goma.backend.RBE_PROD) try_.defaults.goma_backend.set(goma.backend.RBE_PROD)
try_.defaults.mastername.set("tryserver.chromium.codesearch")
try_.defaults.os.set(os.LINUX_DEFAULT) try_.defaults.os.set(os.LINUX_DEFAULT)
try_.defaults.pool.set("luci.chromium.try") try_.defaults.pool.set("luci.chromium.try")
try_.defaults.service_account.set("chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com") try_.defaults.service_account.set("chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com")
......
infra/config/subprojects/goma/goma.star
View file @ fc1b6659
...@@ -42,15 +42,15 @@ defaults.triggered_by.set(["master-gitiles-trigger"]) ...@@ -42,15 +42,15 @@ defaults.triggered_by.set(["master-gitiles-trigger"])
# Builder functions are defined in lexicographic order by name ignoring the # Builder functions are defined in lexicographic order by name ignoring the
# '_builder' suffix # '_builder' suffix
# Builder functions are defined for each master that goma builders appear on, # Builder functions are defined for each builder group that goma builders appear
# with additional functions for specializing on OS or goma grouping (canary, # in, with additional functions for specializing on OS or goma grouping (canary,
# latest client, etc.): XXX_YYY_builder where XXX is the part after the last dot # latest client, etc.): XXX_YYY_builder where XXX is the part after the last dot
# in the mastername and YYY is the OS or goma grouping # in the builder group and YYY is the OS or goma grouping
def fyi_goma_canary_builder(*, name, **kwargs): def fyi_goma_canary_builder(*, name, **kwargs):
return builder( return builder(
name = name, name = name,
mastername = "chromium.goma.fyi", builder_group = "chromium.goma.fyi",
execution_timeout = 10 * time.hour, execution_timeout = 10 * time.hour,
**kwargs **kwargs
) )
...@@ -151,9 +151,9 @@ def fyi_goma_rbe_canary_builder( ...@@ -151,9 +151,9 @@ def fyi_goma_rbe_canary_builder(
**kwargs): **kwargs):
return builder( return builder(
name = name, name = name,
builder_group = "chromium.goma.fyi",
execution_timeout = 10 * time.hour, execution_timeout = 10 * time.hour,
goma_backend = goma_backend, goma_backend = goma_backend,
mastername = "chromium.goma.fyi",
os = os, os = os,
goma_use_luci_auth = True, goma_use_luci_auth = True,
**kwargs **kwargs
...@@ -213,7 +213,7 @@ fyi_goma_rbe_canary_builder( ...@@ -213,7 +213,7 @@ fyi_goma_rbe_canary_builder(
def fyi_goma_latest_client_builder(*, name, os = os.LINUX_DEFAULT, **kwargs): def fyi_goma_latest_client_builder(*, name, os = os.LINUX_DEFAULT, **kwargs):
return builder( return builder(
name = name, name = name,
mastername = "chromium.goma.fyi", builder_group = "chromium.goma.fyi",
execution_timeout = 10 * time.hour, execution_timeout = 10 * time.hour,
os = os, os = os,
**kwargs **kwargs
...@@ -312,9 +312,9 @@ def fyi_goma_rbe_latest_client_builder( ...@@ -312,9 +312,9 @@ def fyi_goma_rbe_latest_client_builder(
**kwargs): **kwargs):
return builder( return builder(
name = name, name = name,
builder_group = "chromium.goma.fyi",
execution_timeout = 10 * time.hour, execution_timeout = 10 * time.hour,
goma_backend = goma_backend, goma_backend = goma_backend,
mastername = "chromium.goma.fyi",
os = os, os = os,
goma_use_luci_auth = True, goma_use_luci_auth = True,
**kwargs **kwargs
...@@ -394,8 +394,8 @@ def goma_builder( ...@@ -394,8 +394,8 @@ def goma_builder(
**kwargs): **kwargs):
return builder( return builder(
name = name, name = name,
builder_group = "chromium.goma",
builderless = builderless, builderless = builderless,
mastername = "chromium.goma",
os = os, os = os,
goma_use_luci_auth = goma_use_luci_auth, goma_use_luci_auth = goma_use_luci_auth,
**kwargs **kwargs
......
infra/config/subprojects/webrtc/webrtc.fyi.star
View file @ fc1b6659
...@@ -33,12 +33,12 @@ luci.gitiles_poller( ...@@ -33,12 +33,12 @@ luci.gitiles_poller(
) )
defaults.bucket.set("webrtc.fyi") defaults.bucket.set("webrtc.fyi")
defaults.builder_group.set("chromium.webrtc.fyi")
defaults.builderless.set(None) defaults.builderless.set(None)
defaults.build_numbers.set(True) defaults.build_numbers.set(True)
defaults.cpu.set(cpu.X86_64) defaults.cpu.set(cpu.X86_64)
defaults.executable.set("recipe:chromium") defaults.executable.set("recipe:chromium")
defaults.execution_timeout.set(2 * time.hour) defaults.execution_timeout.set(2 * time.hour)
defaults.mastername.set("chromium.webrtc.fyi")
defaults.os.set(os.LINUX_DEFAULT) defaults.os.set(os.LINUX_DEFAULT)
defaults.pool.set("luci.chromium.webrtc.fyi") defaults.pool.set("luci.chromium.webrtc.fyi")
defaults.service_account.set("chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com") defaults.service_account.set("chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com")
......
infra/config/subprojects/webrtc/webrtc.star
View file @ fc1b6659
...@@ -27,12 +27,12 @@ luci.bucket( ...@@ -27,12 +27,12 @@ luci.bucket(
) )
defaults.bucket.set("webrtc") defaults.bucket.set("webrtc")
defaults.builder_group.set("chromium.webrtc")
defaults.builderless.set(False) defaults.builderless.set(False)
defaults.build_numbers.set(True) defaults.build_numbers.set(True)
defaults.cpu.set(cpu.X86_64) defaults.cpu.set(cpu.X86_64)
defaults.executable.set("recipe:chromium") defaults.executable.set("recipe:chromium")
defaults.execution_timeout.set(2 * time.hour) defaults.execution_timeout.set(2 * time.hour)
defaults.mastername.set("chromium.webrtc")
defaults.os.set(os.LINUX_DEFAULT) defaults.os.set(os.LINUX_DEFAULT)
defaults.service_account.set("chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com") defaults.service_account.set("chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com")
defaults.swarming_tags.set(["vpython:native-python-wrapper"]) defaults.swarming_tags.set(["vpython:native-python-wrapper"])
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment