Skip to content

A
angle
Commit 281b12d2 by Jamie Madill Committed by Commit Bot
Options

infra: Add different builder group from ci/try.

Uses the 'client.angle' and 'tryserver.angle' naming scheme that both V8 and WebRTC use. Necessary for the scripts to work with swarming tests. Bug: angleproject:5114 Change-Id: I107cf0018e2173117e1d90e840b8e1419e69ef55 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2854277Reviewed-by: 's avatarYuly Novikov <ynovikov@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>
parent c02d5f12
Showing with 9 additions and 5 deletions
infra/config/main.star
...@@ -134,9 +134,7 @@ def get_os_from_name(name): ...@@ -134,9 +134,7 @@ def get_os_from_name(name):
# Adds both the CI and Try standalone builders. # Adds both the CI and Try standalone builders.
def angle_standalone_builder(name, debug, cpu, toolchain = "clang", uwp = False, trace_tests = False): def angle_standalone_builder(name, debug, cpu, toolchain = "clang", uwp = False, trace_tests = False):
properties = { properties = {}
"builder_group": "angle",
}
config_os = get_os_from_name(name) config_os = get_os_from_name(name)
dimensions = {} dimensions = {}
dimensions["os"] = config_os.dimension dimensions["os"] = config_os.dimension
...@@ -161,23 +159,29 @@ def angle_standalone_builder(name, debug, cpu, toolchain = "clang", uwp = False, ...@@ -161,23 +159,29 @@ def angle_standalone_builder(name, debug, cpu, toolchain = "clang", uwp = False,
else: else:
properties["test_mode"] = "compile_and_test" properties["test_mode"] = "compile_and_test"
ci_properties = dict(properties)
ci_properties["builder_group"] = "client.angle"
luci.builder( luci.builder(
name = name, name = name,
bucket = "ci", bucket = "ci",
triggered_by = ["master-poller"], triggered_by = ["master-poller"],
executable = "recipe:angle", executable = "recipe:angle",
service_account = "angle-ci-builder@chops-service-accounts.iam.gserviceaccount.com", service_account = "angle-ci-builder@chops-service-accounts.iam.gserviceaccount.com",
properties = properties, properties = ci_properties,
dimensions = dimensions, dimensions = dimensions,
build_numbers = True, build_numbers = True,
) )
try_properties = dict(properties)
try_properties["builder_group"] = "tryserver.angle"
luci.builder( luci.builder(
name = name, name = name,
bucket = "try", bucket = "try",
executable = "recipe:angle", executable = "recipe:angle",
service_account = "angle-try-builder@chops-service-accounts.iam.gserviceaccount.com", service_account = "angle-try-builder@chops-service-accounts.iam.gserviceaccount.com",
properties = properties, properties = try_properties,
dimensions = dimensions, dimensions = dimensions,
build_numbers = True, build_numbers = True,
) )
......
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