Skip to content

A
angle
Commit ed8755df by Jamie Madill Committed by Commit Bot
Options

Revert "infra: Add different builder group from ci/try."

This reverts commit 281b12d2. Reason for revert: Broke bots. Original change's description: > 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/+/2854277 > Reviewed-by: Yuly Novikov <ynovikov@chromium.org> > Commit-Queue: Jamie Madill <jmadill@chromium.org> Bug: angleproject:5114 Change-Id: I2501f3ad89bc21d80ccdeabd52234a1fc5b39a49 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2855594Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>
parent 281b12d2
Showing with 5 additions and 9 deletions
infra/config/main.star
...@@ -134,7 +134,9 @@ def get_os_from_name(name): ...@@ -134,7 +134,9 @@ 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
...@@ -159,29 +161,23 @@ def angle_standalone_builder(name, debug, cpu, toolchain = "clang", uwp = False, ...@@ -159,29 +161,23 @@ 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 = ci_properties, properties = 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 = try_properties, properties = 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