Skip to content

GitLab

T
tangled
Commit d45dd271 authored by Garrett Beaty's avatar Garrett Beaty Committed by Chromium LUCI CQ
Browse files
Options

Remove the channel information from the milestone objects. 

The channel information is only used for the alt value for links to the
milestone main consoles. These are intended to be the information
displayed when hovering over the links, but this does not appear to
happen and maintaining the channel information complicates the
automation of activation and deactivation of milestones.

Bug: 1165826
Change-Id: I5524db13125d92f2cd319521f74493cda9671863
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2625391
Commit-Queue: Garrett Beaty <gbeaty@chromium.org>
Reviewed-by: default avatarErik Staab <estaab@chromium.org>
Cr-Commit-Position: refs/heads/master@{#842741}
parent 43119c8f
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 93 deletions
infra/config/console-header.star
View file @ d45dd271
...@@ -20,7 +20,7 @@ def _oncall(*, name, url, show_primary_secondary_labels = None, branch_selector ...@@ -20,7 +20,7 @@ def _oncall(*, name, url, show_primary_secondary_labels = None, branch_selector
show_primary_secondary_labels = show_primary_secondary_labels, show_primary_secondary_labels = show_primary_secondary_labels,
)) ))
def _link(*, url, text, alt, branch_selector = branches.MAIN): def _link(*, url, text, alt = None, branch_selector = branches.MAIN):
if not branches.matches(branch_selector): if not branches.matches(branch_selector):
return None return None
return _remove_none_values(dict( return _remove_none_values(dict(
...@@ -275,7 +275,6 @@ HEADER = _header( ...@@ -275,7 +275,6 @@ HEADER = _header(
_link( _link(
text = milestone, text = milestone,
url = "/p/{}/g/main/console".format(details.project), url = "/p/{}/g/main/console".format(details.project),
alt = "{} branch console".format(details.channel),
) )
for milestone, details in sorted(ACTIVE_MILESTONES.items()) for milestone, details in sorted(ACTIVE_MILESTONES.items())
] + [ ] + [
......
infra/config/generated/luci-milo.cfg
View file @ d45dd271
...@@ -690,17 +690,14 @@ consoles { ...@@ -690,17 +690,14 @@ consoles {
links { links {
text: "m86" text: "m86"
url: "/p/chromium-m86/g/main/console" url: "/p/chromium-m86/g/main/console"
alt: "LTS-C branch console"
} }
links { links {
text: "m87" text: "m87"
url: "/p/chromium-m87/g/main/console" url: "/p/chromium-m87/g/main/console"
alt: "Stable branch console"
} }
links { links {
text: "m88" text: "m88"
url: "/p/chromium-m88/g/main/console" url: "/p/chromium-m88/g/main/console"
alt: "Beta branch console"
} }
links { links {
text: "trunk" text: "trunk"
...@@ -1405,17 +1402,14 @@ consoles { ...@@ -1405,17 +1402,14 @@ consoles {
links { links {
text: "m86" text: "m86"
url: "/p/chromium-m86/g/main/console" url: "/p/chromium-m86/g/main/console"
alt: "LTS-C branch console"
} }
links { links {
text: "m87" text: "m87"
url: "/p/chromium-m87/g/main/console" url: "/p/chromium-m87/g/main/console"
alt: "Stable branch console"
} }
links { links {
text: "m88" text: "m88"
url: "/p/chromium-m88/g/main/console" url: "/p/chromium-m88/g/main/console"
alt: "Beta branch console"
} }
links { links {
text: "trunk" text: "trunk"
...@@ -1725,17 +1719,14 @@ consoles { ...@@ -1725,17 +1719,14 @@ consoles {
links { links {
text: "m86" text: "m86"
url: "/p/chromium-m86/g/main/console" url: "/p/chromium-m86/g/main/console"
alt: "LTS-C branch console"
} }
links { links {
text: "m87" text: "m87"
url: "/p/chromium-m87/g/main/console" url: "/p/chromium-m87/g/main/console"
alt: "Stable branch console"
} }
links { links {
text: "m88" text: "m88"
url: "/p/chromium-m88/g/main/console" url: "/p/chromium-m88/g/main/console"
alt: "Beta branch console"
} }
links { links {
text: "trunk" text: "trunk"
...@@ -2195,17 +2186,14 @@ consoles { ...@@ -2195,17 +2186,14 @@ consoles {
links { links {
text: "m86" text: "m86"
url: "/p/chromium-m86/g/main/console" url: "/p/chromium-m86/g/main/console"
alt: "LTS-C branch console"
} }
links { links {
text: "m87" text: "m87"
url: "/p/chromium-m87/g/main/console" url: "/p/chromium-m87/g/main/console"
alt: "Stable branch console"
} }
links { links {
text: "m88" text: "m88"
url: "/p/chromium-m88/g/main/console" url: "/p/chromium-m88/g/main/console"
alt: "Beta branch console"
} }
links { links {
text: "trunk" text: "trunk"
...@@ -2550,17 +2538,14 @@ consoles { ...@@ -2550,17 +2538,14 @@ consoles {
links { links {
text: "m86" text: "m86"
url: "/p/chromium-m86/g/main/console" url: "/p/chromium-m86/g/main/console"
alt: "LTS-C branch console"
} }
links { links {
text: "m87" text: "m87"
url: "/p/chromium-m87/g/main/console" url: "/p/chromium-m87/g/main/console"
alt: "Stable branch console"
} }
links { links {
text: "m88" text: "m88"
url: "/p/chromium-m88/g/main/console" url: "/p/chromium-m88/g/main/console"
alt: "Beta branch console"
} }
links { links {
text: "trunk" text: "trunk"
...@@ -3049,17 +3034,14 @@ consoles { ...@@ -3049,17 +3034,14 @@ consoles {
links { links {
text: "m86" text: "m86"
url: "/p/chromium-m86/g/main/console" url: "/p/chromium-m86/g/main/console"
alt: "LTS-C branch console"
} }
links { links {
text: "m87" text: "m87"
url: "/p/chromium-m87/g/main/console" url: "/p/chromium-m87/g/main/console"
alt: "Stable branch console"
} }
links { links {
text: "m88" text: "m88"
url: "/p/chromium-m88/g/main/console" url: "/p/chromium-m88/g/main/console"
alt: "Beta branch console"
} }
links { links {
text: "trunk" text: "trunk"
...@@ -3384,17 +3366,14 @@ consoles { ...@@ -3384,17 +3366,14 @@ consoles {
links { links {
text: "m86" text: "m86"
url: "/p/chromium-m86/g/main/console" url: "/p/chromium-m86/g/main/console"
alt: "LTS-C branch console"
} }
links { links {
text: "m87" text: "m87"
url: "/p/chromium-m87/g/main/console" url: "/p/chromium-m87/g/main/console"
alt: "Stable branch console"
} }
links { links {
text: "m88" text: "m88"
url: "/p/chromium-m88/g/main/console" url: "/p/chromium-m88/g/main/console"
alt: "Beta branch console"
} }
links { links {
text: "trunk" text: "trunk"
...@@ -3864,17 +3843,14 @@ consoles { ...@@ -3864,17 +3843,14 @@ consoles {
links { links {
text: "m86" text: "m86"
url: "/p/chromium-m86/g/main/console" url: "/p/chromium-m86/g/main/console"
alt: "LTS-C branch console"
} }
links { links {
text: "m87" text: "m87"
url: "/p/chromium-m87/g/main/console" url: "/p/chromium-m87/g/main/console"
alt: "Stable branch console"
} }
links { links {
text: "m88" text: "m88"
url: "/p/chromium-m88/g/main/console" url: "/p/chromium-m88/g/main/console"
alt: "Beta branch console"
} }
links { links {
text: "trunk" text: "trunk"
...@@ -4214,17 +4190,14 @@ consoles { ...@@ -4214,17 +4190,14 @@ consoles {
links { links {
text: "m86" text: "m86"
url: "/p/chromium-m86/g/main/console" url: "/p/chromium-m86/g/main/console"
alt: "LTS-C branch console"
} }
links { links {
text: "m87" text: "m87"
url: "/p/chromium-m87/g/main/console" url: "/p/chromium-m87/g/main/console"
alt: "Stable branch console"
} }
links { links {
text: "m88" text: "m88"
url: "/p/chromium-m88/g/main/console" url: "/p/chromium-m88/g/main/console"
alt: "Beta branch console"
} }
links { links {
text: "trunk" text: "trunk"
...@@ -4709,17 +4682,14 @@ consoles { ...@@ -4709,17 +4682,14 @@ consoles {
links { links {
text: "m86" text: "m86"
url: "/p/chromium-m86/g/main/console" url: "/p/chromium-m86/g/main/console"
alt: "LTS-C branch console"
} }
links { links {
text: "m87" text: "m87"
url: "/p/chromium-m87/g/main/console" url: "/p/chromium-m87/g/main/console"
alt: "Stable branch console"
} }
links { links {
text: "m88" text: "m88"
url: "/p/chromium-m88/g/main/console" url: "/p/chromium-m88/g/main/console"
alt: "Beta branch console"
} }
links { links {
text: "trunk" text: "trunk"
...@@ -5119,17 +5089,14 @@ consoles { ...@@ -5119,17 +5089,14 @@ consoles {
links { links {
text: "m86" text: "m86"
url: "/p/chromium-m86/g/main/console" url: "/p/chromium-m86/g/main/console"
alt: "LTS-C branch console"
} }
links { links {
text: "m87" text: "m87"
url: "/p/chromium-m87/g/main/console" url: "/p/chromium-m87/g/main/console"
alt: "Stable branch console"
} }
links { links {
text: "m88" text: "m88"
url: "/p/chromium-m88/g/main/console" url: "/p/chromium-m88/g/main/console"
alt: "Beta branch console"
} }
links { links {
text: "trunk" text: "trunk"
...@@ -5558,17 +5525,14 @@ consoles { ...@@ -5558,17 +5525,14 @@ consoles {
links { links {
text: "m86" text: "m86"
url: "/p/chromium-m86/g/main/console" url: "/p/chromium-m86/g/main/console"
alt: "LTS-C branch console"
} }
links { links {
text: "m87" text: "m87"
url: "/p/chromium-m87/g/main/console" url: "/p/chromium-m87/g/main/console"
alt: "Stable branch console"
} }
links { links {
text: "m88" text: "m88"
url: "/p/chromium-m88/g/main/console" url: "/p/chromium-m88/g/main/console"
alt: "Beta branch console"
} }
links { links {
text: "trunk" text: "trunk"
...@@ -6217,17 +6181,14 @@ consoles { ...@@ -6217,17 +6181,14 @@ consoles {
links { links {
text: "m86" text: "m86"
url: "/p/chromium-m86/g/main/console" url: "/p/chromium-m86/g/main/console"
alt: "LTS-C branch console"
} }
links { links {
text: "m87" text: "m87"
url: "/p/chromium-m87/g/main/console" url: "/p/chromium-m87/g/main/console"
alt: "Stable branch console"
} }
links { links {
text: "m88" text: "m88"
url: "/p/chromium-m88/g/main/console" url: "/p/chromium-m88/g/main/console"
alt: "Beta branch console"
} }
links { links {
text: "trunk" text: "trunk"
...@@ -6599,17 +6560,14 @@ consoles { ...@@ -6599,17 +6560,14 @@ consoles {
links { links {
text: "m86" text: "m86"
url: "/p/chromium-m86/g/main/console" url: "/p/chromium-m86/g/main/console"
alt: "LTS-C branch console"
} }
links { links {
text: "m87" text: "m87"
url: "/p/chromium-m87/g/main/console" url: "/p/chromium-m87/g/main/console"
alt: "Stable branch console"
} }
links { links {
text: "m88" text: "m88"
url: "/p/chromium-m88/g/main/console" url: "/p/chromium-m88/g/main/console"
alt: "Beta branch console"
} }
links { links {
text: "trunk" text: "trunk"
...@@ -6990,17 +6948,14 @@ consoles { ...@@ -6990,17 +6948,14 @@ consoles {
links { links {
text: "m86" text: "m86"
url: "/p/chromium-m86/g/main/console" url: "/p/chromium-m86/g/main/console"
alt: "LTS-C branch console"
} }
links { links {
text: "m87" text: "m87"
url: "/p/chromium-m87/g/main/console" url: "/p/chromium-m87/g/main/console"
alt: "Stable branch console"
} }
links { links {
text: "m88" text: "m88"
url: "/p/chromium-m88/g/main/console" url: "/p/chromium-m88/g/main/console"
alt: "Beta branch console"
} }
links { links {
text: "trunk" text: "trunk"
...@@ -7336,17 +7291,14 @@ consoles { ...@@ -7336,17 +7291,14 @@ consoles {
links { links {
text: "m86" text: "m86"
url: "/p/chromium-m86/g/main/console" url: "/p/chromium-m86/g/main/console"
alt: "LTS-C branch console"
} }
links { links {
text: "m87" text: "m87"
url: "/p/chromium-m87/g/main/console" url: "/p/chromium-m87/g/main/console"
alt: "Stable branch console"
} }
links { links {
text: "m88" text: "m88"
url: "/p/chromium-m88/g/main/console" url: "/p/chromium-m88/g/main/console"
alt: "Beta branch console"
} }
links { links {
text: "trunk" text: "trunk"
...@@ -8036,17 +7988,14 @@ consoles { ...@@ -8036,17 +7988,14 @@ consoles {
links { links {
text: "m86" text: "m86"
url: "/p/chromium-m86/g/main/console" url: "/p/chromium-m86/g/main/console"
alt: "LTS-C branch console"
} }
links { links {
text: "m87" text: "m87"
url: "/p/chromium-m87/g/main/console" url: "/p/chromium-m87/g/main/console"
alt: "Stable branch console"
} }
links { links {
text: "m88" text: "m88"
url: "/p/chromium-m88/g/main/console" url: "/p/chromium-m88/g/main/console"
alt: "Beta branch console"
} }
links { links {
text: "trunk" text: "trunk"
...@@ -8436,17 +8385,14 @@ consoles { ...@@ -8436,17 +8385,14 @@ consoles {
links { links {
text: "m86" text: "m86"
url: "/p/chromium-m86/g/main/console" url: "/p/chromium-m86/g/main/console"
alt: "LTS-C branch console"
} }
links { links {
text: "m87" text: "m87"
url: "/p/chromium-m87/g/main/console" url: "/p/chromium-m87/g/main/console"
alt: "Stable branch console"
} }
links { links {
text: "m88" text: "m88"
url: "/p/chromium-m88/g/main/console" url: "/p/chromium-m88/g/main/console"
alt: "Beta branch console"
} }
links { links {
text: "trunk" text: "trunk"
...@@ -8786,17 +8732,14 @@ consoles { ...@@ -8786,17 +8732,14 @@ consoles {
links { links {
text: "m86" text: "m86"
url: "/p/chromium-m86/g/main/console" url: "/p/chromium-m86/g/main/console"
alt: "LTS-C branch console"
} }
links { links {
text: "m87" text: "m87"
url: "/p/chromium-m87/g/main/console" url: "/p/chromium-m87/g/main/console"
alt: "Stable branch console"
} }
links { links {
text: "m88" text: "m88"
url: "/p/chromium-m88/g/main/console" url: "/p/chromium-m88/g/main/console"
alt: "Beta branch console"
} }
links { links {
text: "trunk" text: "trunk"
...@@ -9171,17 +9114,14 @@ consoles { ...@@ -9171,17 +9114,14 @@ consoles {
links { links {
text: "m86" text: "m86"
url: "/p/chromium-m86/g/main/console" url: "/p/chromium-m86/g/main/console"
alt: "LTS-C branch console"
} }
links { links {
text: "m87" text: "m87"
url: "/p/chromium-m87/g/main/console" url: "/p/chromium-m87/g/main/console"
alt: "Stable branch console"
} }
links { links {
text: "m88" text: "m88"
url: "/p/chromium-m88/g/main/console" url: "/p/chromium-m88/g/main/console"
alt: "Beta branch console"
} }
links { links {
text: "trunk" text: "trunk"
...@@ -9480,17 +9420,14 @@ consoles { ...@@ -9480,17 +9420,14 @@ consoles {
links { links {
text: "m86" text: "m86"
url: "/p/chromium-m86/g/main/console" url: "/p/chromium-m86/g/main/console"
alt: "LTS-C branch console"
} }
links { links {
text: "m87" text: "m87"
url: "/p/chromium-m87/g/main/console" url: "/p/chromium-m87/g/main/console"
alt: "Stable branch console"
} }
links { links {
text: "m88" text: "m88"
url: "/p/chromium-m88/g/main/console" url: "/p/chromium-m88/g/main/console"
alt: "Beta branch console"
} }
links { links {
text: "trunk" text: "trunk"
...@@ -9840,17 +9777,14 @@ consoles { ...@@ -9840,17 +9777,14 @@ consoles {
links { links {
text: "m86" text: "m86"
url: "/p/chromium-m86/g/main/console" url: "/p/chromium-m86/g/main/console"
alt: "LTS-C branch console"
} }
links { links {
text: "m87" text: "m87"
url: "/p/chromium-m87/g/main/console" url: "/p/chromium-m87/g/main/console"
alt: "Stable branch console"
} }
links { links {
text: "m88" text: "m88"
url: "/p/chromium-m88/g/main/console" url: "/p/chromium-m88/g/main/console"
alt: "Beta branch console"
} }
links { links {
text: "trunk" text: "trunk"
...@@ -10250,17 +10184,14 @@ consoles { ...@@ -10250,17 +10184,14 @@ consoles {
links { links {
text: "m86" text: "m86"
url: "/p/chromium-m86/g/main/console" url: "/p/chromium-m86/g/main/console"
alt: "LTS-C branch console"
} }
links { links {
text: "m87" text: "m87"
url: "/p/chromium-m87/g/main/console" url: "/p/chromium-m87/g/main/console"
alt: "Stable branch console"
} }
links { links {
text: "m88" text: "m88"
url: "/p/chromium-m88/g/main/console" url: "/p/chromium-m88/g/main/console"
alt: "Beta branch console"
} }
links { links {
text: "trunk" text: "trunk"
...@@ -10585,17 +10516,14 @@ consoles { ...@@ -10585,17 +10516,14 @@ consoles {
links { links {
text: "m86" text: "m86"
url: "/p/chromium-m86/g/main/console" url: "/p/chromium-m86/g/main/console"
alt: "LTS-C branch console"
} }
links { links {
text: "m87" text: "m87"
url: "/p/chromium-m87/g/main/console" url: "/p/chromium-m87/g/main/console"
alt: "Stable branch console"
} }
links { links {
text: "m88" text: "m88"
url: "/p/chromium-m88/g/main/console" url: "/p/chromium-m88/g/main/console"
alt: "Beta branch console"
} }
links { links {
text: "trunk" text: "trunk"
...@@ -10960,17 +10888,14 @@ consoles { ...@@ -10960,17 +10888,14 @@ consoles {
links { links {
text: "m86" text: "m86"
url: "/p/chromium-m86/g/main/console" url: "/p/chromium-m86/g/main/console"
alt: "LTS-C branch console"
} }
links { links {
text: "m87" text: "m87"
url: "/p/chromium-m87/g/main/console" url: "/p/chromium-m87/g/main/console"
alt: "Stable branch console"
} }
links { links {
text: "m88" text: "m88"
url: "/p/chromium-m88/g/main/console" url: "/p/chromium-m88/g/main/console"
alt: "Beta branch console"
} }
links { links {
text: "trunk" text: "trunk"
...@@ -11305,17 +11230,14 @@ consoles { ...@@ -11305,17 +11230,14 @@ consoles {
links { links {
text: "m86" text: "m86"
url: "/p/chromium-m86/g/main/console" url: "/p/chromium-m86/g/main/console"
alt: "LTS-C branch console"
} }
links { links {
text: "m87" text: "m87"
url: "/p/chromium-m87/g/main/console" url: "/p/chromium-m87/g/main/console"
alt: "Stable branch console"
} }
links { links {
text: "m88" text: "m88"
url: "/p/chromium-m88/g/main/console" url: "/p/chromium-m88/g/main/console"
alt: "Beta branch console"
} }
links { links {
text: "trunk" text: "trunk"
...@@ -11717,17 +11639,14 @@ consoles { ...@@ -11717,17 +11639,14 @@ consoles {
links { links {
text: "m86" text: "m86"
url: "/p/chromium-m86/g/main/console" url: "/p/chromium-m86/g/main/console"
alt: "LTS-C branch console"
} }
links { links {
text: "m87" text: "m87"
url: "/p/chromium-m87/g/main/console" url: "/p/chromium-m87/g/main/console"
alt: "Stable branch console"
} }
links { links {
text: "m88" text: "m88"
url: "/p/chromium-m88/g/main/console" url: "/p/chromium-m88/g/main/console"
alt: "Beta branch console"
} }
links { links {
text: "trunk" text: "trunk"
...@@ -12035,17 +11954,14 @@ consoles { ...@@ -12035,17 +11954,14 @@ consoles {
links { links {
text: "m86" text: "m86"
url: "/p/chromium-m86/g/main/console" url: "/p/chromium-m86/g/main/console"
alt: "LTS-C branch console"
} }
links { links {
text: "m87" text: "m87"
url: "/p/chromium-m87/g/main/console" url: "/p/chromium-m87/g/main/console"
alt: "Stable branch console"
} }
links { links {
text: "m88" text: "m88"
url: "/p/chromium-m88/g/main/console" url: "/p/chromium-m88/g/main/console"
alt: "Beta branch console"
} }
links { links {
text: "trunk" text: "trunk"
......
infra/config/project.star
View file @ d45dd271
...@@ -64,7 +64,7 @@ def _generate_project_pyl(ctx): ...@@ -64,7 +64,7 @@ def _generate_project_pyl(ctx):
lucicfg.generator(_generate_project_pyl) lucicfg.generator(_generate_project_pyl)
def _milestone_details(*, project, ref, channel): def _milestone_details(*, project, ref):
"""Define the details for an active milestone. """Define the details for an active milestone.
Args: Args:
...@@ -72,13 +72,10 @@ def _milestone_details(*, project, ref, channel): ...@@ -72,13 +72,10 @@ def _milestone_details(*, project, ref, channel):
milestone. milestone.
* ref - The ref in the git repository that contains the code for the * ref - The ref in the git repository that contains the code for the
milestone. milestone.
* channel - The name of the release channel the milestone is in (used for
identifying the milestone in the console header).
""" """
return struct( return struct(
project = project, project = project,
ref = ref, ref = ref,
channel = channel,
) )
# The milestone names and branch numbers of branches that we have builders # The milestone names and branch numbers of branches that we have builders
...@@ -91,16 +88,13 @@ ACTIVE_MILESTONES = { ...@@ -91,16 +88,13 @@ ACTIVE_MILESTONES = {
"m86": _milestone_details( "m86": _milestone_details(
project = "chromium-m86", project = "chromium-m86",
ref = "refs/branch-heads/4240", ref = "refs/branch-heads/4240",
channel = "LTS-C",
), ),
"m87": _milestone_details( "m87": _milestone_details(
project = "chromium-m87", project = "chromium-m87",
ref = "refs/branch-heads/4280", ref = "refs/branch-heads/4280",
channel = "Stable",
), ),
"m88": _milestone_details( "m88": _milestone_details(
project = "chromium-m88", project = "chromium-m88",
ref = "refs/branch-heads/4324", ref = "refs/branch-heads/4324",
channel = "Beta",
), ),
} }
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