Commit 9dfbd57d authored by Garrett Beaty's avatar Garrett Beaty Committed by Chromium LUCI CQ

Remove add_to_console_view and add_to_list_view arguments.

These arguments are unnecessary as they were only needed when milestones
were bucket-based to prevent filling the per-builder group consoles with
the branched versions of builders.

Change-Id: I114d30e197f8eaf2620ee18b3954e074cb200f15
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2583153
Auto-Submit: Garrett Beaty <gbeaty@chromium.org>
Reviewed-by: default avatarStephen Martinis <martiniss@chromium.org>
Commit-Queue: Garrett Beaty <gbeaty@chromium.org>
Cr-Commit-Position: refs/heads/master@{#835702}
parent 10a12b7e
...@@ -21,7 +21,6 @@ load("./builders.star", "builders") ...@@ -21,7 +21,6 @@ load("./builders.star", "builders")
defaults = args.defaults( defaults = args.defaults(
extends = builders.defaults, extends = builders.defaults,
add_to_console_view = False,
console_view = args.COMPUTE, console_view = args.COMPUTE,
header = None, header = None,
main_console_view = None, main_console_view = None,
...@@ -331,7 +330,6 @@ def ci_builder( ...@@ -331,7 +330,6 @@ def ci_builder(
*, *,
name, name,
branch_selector = branches.MAIN, branch_selector = branches.MAIN,
add_to_console_view = args.DEFAULT,
console_view = args.DEFAULT, console_view = args.DEFAULT,
main_console_view = args.DEFAULT, main_console_view = args.DEFAULT,
cq_mirrors_console_view = args.DEFAULT, cq_mirrors_console_view = args.DEFAULT,
...@@ -348,25 +346,17 @@ def ci_builder( ...@@ -348,25 +346,17 @@ def ci_builder(
branch_selector - A branch selector value controlling whether the branch_selector - A branch selector value controlling whether the
builder definition is executed. See branches.star for more builder definition is executed. See branches.star for more
information. information.
add_to_console_view - A bool indicating whether an entry should be
created for the builder in the console identified by
`console_view`. Supports a module-level default that defaults to
False.
console_view - A string identifying the ID of the console view to console_view - A string identifying the ID of the console view to
add an entry to. Supports a module-level default that defaults to add an entry to. Supports a module-level default that defaults to
the group of the builder, if provided. An entry will be added the group of the builder, if provided.
only if `add_to_console_view` is True and `console_view_entry` is
provided.
main_console_view - A string identifying the ID of the main console main_console_view - A string identifying the ID of the main console
view to add an entry to. Supports a module-level default that view to add an entry to. Supports a module-level default that
defaults to None. An entry will be added only if defaults to None. An entry will be added only if
`console_view_entry` is provided. Note that `add_to_console_view` `console_view_entry` is provided.
has no effect on creating an entry to the main console view.
cq_mirrors_console_view - A string identifying the ID of the CQ cq_mirrors_console_view - A string identifying the ID of the CQ
mirrors console view to add an entry to. Supports a module-level mirrors console view to add an entry to. Supports a module-level
default that defaults to None. An entry will be added only if default that defaults to None. An entry will be added only if
`console_view_entry` is provided. Note that `add_to_console_view` `console_view_entry` is provided.
has no effect on creating an entry to the main console view.
console_view_entry - A structure providing the details of the entry console_view_entry - A structure providing the details of the entry
to add to the console view. See `ci.console_view_entry` for details. to add to the console view. See `ci.console_view_entry` for details.
tree_closing - If true, failed builds from this builder that meet certain tree_closing - If true, failed builds from this builder that meet certain
...@@ -427,20 +417,14 @@ def ci_builder( ...@@ -427,20 +417,14 @@ def ci_builder(
console_view = defaults.get_value_from_kwargs("builder_group", kwargs) console_view = defaults.get_value_from_kwargs("builder_group", kwargs)
if console_view: if console_view:
add_to_console_view = defaults.get_value(
"add_to_console_view",
add_to_console_view,
)
builder = "{}/{}".format(bucket, name) builder = "{}/{}".format(bucket, name)
if add_to_console_view: luci.console_view_entry(
luci.console_view_entry( builder = builder,
builder = builder, console_view = console_view,
console_view = console_view, category = console_view_entry.category,
category = console_view_entry.category, short_name = console_view_entry.short_name,
short_name = console_view_entry.short_name, )
)
overview_console_category = console_view overview_console_category = console_view
if console_view_entry.category: if console_view_entry.category:
......
...@@ -32,7 +32,6 @@ DEFAULT_EXCLUDE_REGEXPS = [ ...@@ -32,7 +32,6 @@ DEFAULT_EXCLUDE_REGEXPS = [
defaults = args.defaults( defaults = args.defaults(
extends = builders.defaults, extends = builders.defaults,
add_to_list_view = False,
cq_group = None, cq_group = None,
list_view = args.COMPUTE, list_view = args.COMPUTE,
main_list_view = None, main_list_view = None,
...@@ -115,7 +114,6 @@ def try_builder( ...@@ -115,7 +114,6 @@ def try_builder(
*, *,
name, name,
branch_selector = branches.MAIN, branch_selector = branches.MAIN,
add_to_list_view = args.DEFAULT,
cq_group = args.DEFAULT, cq_group = args.DEFAULT,
list_view = args.DEFAULT, list_view = args.DEFAULT,
main_list_view = args.DEFAULT, main_list_view = args.DEFAULT,
...@@ -131,24 +129,17 @@ def try_builder( ...@@ -131,24 +129,17 @@ def try_builder(
branch_selector - A branch selector value controlling whether the branch_selector - A branch selector value controlling whether the
builder definition is executed. See branches.star for more builder definition is executed. See branches.star for more
information. information.
add_to_list_view - A bool indicating whether an entry should be
created for the builder in the console identified by
`list_view`. Supports a module-level default that defaults to
False.
cq_group - The CQ group to add the builder to. If tryjob is None, it will cq_group - The CQ group to add the builder to. If tryjob is None, it will
be added as includable_only. be added as includable_only.
list_view - A string identifying the ID of the list view to list_view - A string identifying the ID of the list view to
add an entry to. Supports a module-level default that defaults to add an entry to. Supports a module-level default that defaults to
the group of the builder, if provided. An entry will be added the group of the builder, if provided.
only if `add_to_list_view` is True.
main_console_view - A string identifying the ID of the main list main_console_view - A string identifying the ID of the main list
view to add an entry to. Supports a module-level default that view to add an entry to. Supports a module-level default that
defaults to None. Note that `add_to_list_view` has no effect on defaults to None.
adding an entry to the main list view.
subproject_list_view - A string identifying the ID of the subproject_list_view - A string identifying the ID of the
subproject list view to add an entry to. Suppoers a module-level subproject list view to add an entry to. Suppoers a module-level
default that defaults to None. Not that `add_to_list_view` has default that defaults to None.
no effect on adding an entry to the subproject list view.
tryjob - A struct containing the details of the tryjob verifier for the tryjob - A struct containing the details of the tryjob verifier for the
builder, obtained by calling the `tryjob` function. builder, obtained by calling the `tryjob` function.
experiments - a dict of experiment name to the percentage chance (0-100) experiments - a dict of experiment name to the percentage chance (0-100)
...@@ -218,22 +209,15 @@ def try_builder( ...@@ -218,22 +209,15 @@ def try_builder(
includable_only = True, includable_only = True,
) )
add_to_list_view = defaults.get_value("add_to_list_view", add_to_list_view) list_view = defaults.get_value("list_view", list_view)
if add_to_list_view: if list_view == args.COMPUTE:
list_view = defaults.get_value("list_view", list_view) list_view = defaults.get_value_from_kwargs("builder_group", kwargs)
if list_view == args.COMPUTE:
list_view = defaults.get_value_from_kwargs("builder_group", kwargs) if list_view:
luci.list_view_entry(
if list_view: builder = builder,
add_to_list_view = defaults.get_value( list_view = list_view,
"add_to_list_view", )
add_to_list_view,
)
luci.list_view_entry(
builder = builder,
list_view = list_view,
)
main_list_view = defaults.get_value("main_list_view", main_list_view) main_list_view = defaults.get_value("main_list_view", main_list_view)
if main_list_view: if main_list_view:
......
...@@ -12,7 +12,6 @@ def main_console_if_on_branch(): ...@@ -12,7 +12,6 @@ def main_console_if_on_branch():
return branches.value(for_branches = "main") return branches.value(for_branches = "main")
ci.defaults.set( ci.defaults.set(
add_to_console_view = True,
bucket = "ci", bucket = "ci",
build_numbers = True, build_numbers = True,
configure_kitchen = True, configure_kitchen = True,
......
...@@ -6,7 +6,6 @@ load("//lib/builders.star", "cpu", "goma", "os") ...@@ -6,7 +6,6 @@ load("//lib/builders.star", "cpu", "goma", "os")
load("//lib/try.star", "try_") load("//lib/try.star", "try_")
try_.defaults.set( try_.defaults.set(
add_to_list_view = True,
bucket = "try", bucket = "try",
build_numbers = True, build_numbers = True,
caches = [ caches = [
......
...@@ -6,7 +6,6 @@ load("//lib/builders.star", "cpu", "os") ...@@ -6,7 +6,6 @@ load("//lib/builders.star", "cpu", "os")
load("//lib/try.star", "try_") load("//lib/try.star", "try_")
try_.defaults.set( try_.defaults.set(
add_to_list_view = True,
bucket = "try", bucket = "try",
build_numbers = True, build_numbers = True,
caches = [ caches = [
......
...@@ -8,7 +8,6 @@ load("//lib/try.star", "try_") ...@@ -8,7 +8,6 @@ load("//lib/try.star", "try_")
load("//project.star", "settings") load("//project.star", "settings")
try_.defaults.set( try_.defaults.set(
add_to_list_view = True,
bucket = "try", bucket = "try",
build_numbers = True, build_numbers = True,
caches = [ caches = [
......
...@@ -23,7 +23,6 @@ luci.bucket( ...@@ -23,7 +23,6 @@ luci.bucket(
], ],
) )
try_.defaults.add_to_list_view.set(True)
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.builder_group.set("tryserver.chromium.codesearch")
......
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