[infra] Remove goma properties
Goma is not used for CI/CQ anymore. Bug: b/245249582 Fixed: b/245249582 Change-Id: I1cf4799611cae2028a9deb53e14a16a02fb69a6a Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/292820 Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org> Auto-Submit: Junji Watanabe <jwata@google.com> Reviewed-by: Christoffer Jansson <jansson@webrtc.org> Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org> Cr-Commit-Position: refs/heads/main@{#39279}
This commit is contained in:
parent
bce135a4a7
commit
5c06bef3e6
@ -18,25 +18,6 @@ DEFAULT_CPU = "x86-64"
|
||||
|
||||
# Helpers:
|
||||
|
||||
def make_goma_properties(enable_ats = True, jobs = None):
|
||||
"""Makes a default goma property with the specified argument.
|
||||
|
||||
Args:
|
||||
enable_ats: True if the ATS should be enabled.
|
||||
jobs: Number of jobs to be used by the builder.
|
||||
Returns:
|
||||
A dictonary with the goma properties.
|
||||
"""
|
||||
goma_properties = {
|
||||
"server_host": "goma.chromium.org",
|
||||
"use_luci_auth": True,
|
||||
}
|
||||
if not enable_ats:
|
||||
goma_properties["enable_ats"] = enable_ats
|
||||
if jobs:
|
||||
goma_properties["jobs"] = jobs
|
||||
return {"$build/goma": goma_properties}
|
||||
|
||||
def make_reclient_properties(instance, jobs = None):
|
||||
"""Makes a default reclient property with the specified argument.
|
||||
|
||||
@ -550,8 +531,6 @@ def ci_builder(
|
||||
properties["builder_group"] = "client.webrtc"
|
||||
properties.update(make_reclient_properties("rbe-webrtc-trusted"))
|
||||
|
||||
# TODO(b/245249582): remove goma properties after reclient migration.
|
||||
properties.update(make_goma_properties())
|
||||
notifies = ["post_submit_failure_notifier", "infra_failure_notifier"]
|
||||
notifies += ["webrtc_tree_closer"] if name not in skipped_lkgr_bots else []
|
||||
return webrtc_builder(
|
||||
@ -573,8 +552,6 @@ def try_builder(
|
||||
try_cat = True,
|
||||
cq = {},
|
||||
branch_cq = True,
|
||||
goma_enable_ats = True,
|
||||
goma_jobs = None,
|
||||
**kwargs):
|
||||
"""Add a pre-submit builder.
|
||||
|
||||
@ -585,8 +562,6 @@ def try_builder(
|
||||
try_cat: boolean, whether to include this builder in the /try/ console. See also: `add_milo`.
|
||||
cq: None to exclude this from all commit queues, or a dict of kwargs for cq_tryjob_verifier.
|
||||
branch_cq: False to exclude this builder just from the release-branch CQ.
|
||||
goma_enable_ats: True if the ATS should be enabled by the builder.
|
||||
goma_jobs: Number of jobs to be used by the builder.
|
||||
**kwargs: Pass on to webrtc_builder / luci.builder.
|
||||
Returns:
|
||||
A luci.builder.
|
||||
@ -595,7 +570,6 @@ def try_builder(
|
||||
dimensions.update({"pool": "luci.webrtc.try", "cpu": DEFAULT_CPU})
|
||||
properties = properties or {}
|
||||
properties["builder_group"] = "tryserver.webrtc"
|
||||
properties.update(make_goma_properties(enable_ats = goma_enable_ats, jobs = goma_jobs))
|
||||
properties.update(make_reclient_properties("rbe-webrtc-untrusted"))
|
||||
if cq != None:
|
||||
luci.cq_tryjob_verifier(name, cq_group = "cq", **cq)
|
||||
@ -625,8 +599,7 @@ def perf_builder(name, perf_cat, **kwargs):
|
||||
Notifications are also disabled.
|
||||
"""
|
||||
add_milo(name, {"perf": perf_cat})
|
||||
properties = make_goma_properties()
|
||||
properties.update(make_reclient_properties("rbe-webrtc-trusted"))
|
||||
properties = make_reclient_properties("rbe-webrtc-trusted")
|
||||
properties["builder_group"] = "client.webrtc.perf"
|
||||
dimensions = {"pool": "luci.webrtc.perf", "os": "Linux", "cores": "2"}
|
||||
if "Android" in name:
|
||||
@ -689,7 +662,6 @@ win_builder = normal_builder_factory(
|
||||
|
||||
win_try_job = normal_builder_factory(
|
||||
dimensions = {"os": "Windows"},
|
||||
goma_enable_ats = False,
|
||||
)[1]
|
||||
|
||||
mac_builder, mac_try_job = normal_builder_factory(
|
||||
@ -824,8 +796,8 @@ win_builder("Win64 ASan", "Win Clang|x64|asan")
|
||||
win_try_job("win_asan")
|
||||
win_builder("Win (more configs)", "Win Clang|x86|more")
|
||||
win_try_job("win_x86_more_configs")
|
||||
win_try_job("win_chromium_compile", recipe = "chromium_trybot", branch_cq = False, goma_jobs = 150)
|
||||
win_try_job("win_chromium_compile_dbg", recipe = "chromium_trybot", branch_cq = False, goma_jobs = 150)
|
||||
win_try_job("win_chromium_compile", recipe = "chromium_trybot", branch_cq = False)
|
||||
win_try_job("win_chromium_compile_dbg", recipe = "chromium_trybot", branch_cq = False)
|
||||
|
||||
linux_try_job(
|
||||
"presubmit",
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -7,7 +7,7 @@
|
||||
name: "webrtc"
|
||||
access: "group:all"
|
||||
lucicfg {
|
||||
version: "1.37.0"
|
||||
version: "1.38.1"
|
||||
package_dir: "."
|
||||
config_dir: "."
|
||||
entry_point: "config.star"
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user