Add a library for altering starlark execution based on the branch.

Separating the branch configuration by file has been rather unwieldy and
would only get worse when it is necessary to maintain a 3rd subset of
builders for LTS. This puts the information about what branches the LUCI
resources are applicable to with the resource.

Bug: 1119446
Change-Id: I1c8622b7084fd332ae16fcdc9afe5d6e30dc1811
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2365915
Commit-Queue: Garrett Beaty <gbeaty@chromium.org>
Reviewed-by: Erik Staab <estaab@chromium.org>
Cr-Commit-Position: refs/heads/master@{#800627}

infra/config/lib/branches.star

+# Copyright 2020 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+"""Library containing utilities for providing branch-specific definitions.
+
+The module provide the `branches` struct which provides access to versions of
+a subset of luci functions with an additional `branch_selector` keyword argument
+that controls what branches the definition is actually executed for. If
+`branch_selector` doesn't match the current branch as determined by values on
+the `settings` struct in '//project.star', then the resource is not defined. The
+`branch_selector argument` can be one of the following constants:
+* MAIN_ONLY - The resource is defined only for main/master/trunk
+    [`settings.is_master`]
+* STANDARD_RELEASES - The resource is defined for main/master/trunk and beta and
+    stable branches
+    [`settings.is_master and not settings.is_lts_branch`]
+* ALL_RELEASES - The resource is defined for main/master/trunk, beta and stable
+    branches and LTC/LTS branches
+    [`True`]
+The constants are also accessible via the `branches` struct.
+
+For other uses cases where execution needs to vary by branch, the following are
+also accessible via the `branches` struct:
+* matches - Allows library code to be written that takes branch-specific
+    behavior.
+* value - Allows for providing different values between main/master/trunk and
+    branches.
+* exec - Allows for conditionally executing starlark modules.
+"""
+
+load("//project.star", "settings")
+
+def _branch_selector(tag):
+    return struct(__branch_selector__ = tag)
+
+MAIN_ONLY = _branch_selector("MAIN_ONLY")
+STANDARD_RELEASES = _branch_selector("STANDARD_RELEASES")
+ALL_RELEASES = _branch_selector("ALL_RELEASES")
+
+_BRANCH_SELECTORS = (MAIN_ONLY, STANDARD_RELEASES, ALL_RELEASES)
+
+def _matches(branch_selector):
+    """Returns whether `branch_selector` matches the project settings."""
+    if branch_selector == MAIN_ONLY:
+        return settings.is_master
+    if branch_selector == STANDARD_RELEASES:
+        return settings.is_master or not settings.is_lts_branch
+    if branch_selector == ALL_RELEASES:
+        return True
+    fail("branch_selector must be one of {}, got {!r}".format(_BRANCH_SELECTORS, branch_selector))
+
+def _value(*, for_main = None, for_branches = None):
+    """Provide a value that varies between main/master/trunk and branches.
+
+    If the current project settings indicate that this is main/master/trunk,
+    then `for_main` will be returned. Otherwise, `for_branches` will be
+    returned.
+    """
+    return for_main if settings.is_master else for_branches
+
+def _exec(module, *, branch_selector = MAIN_ONLY):
+    """Execute `module` if `branch_selector` matches the project settings."""
+    if not _matches(branch_selector):
+        return
+    exec(module)
+
+def _make_branch_conditional(fn):
+    def conditional_fn(*args, branch_selector = MAIN_ONLY, **kwargs):
+        if not _matches(branch_selector):
+            return
+        fn(*args, **kwargs)
+
+    return conditional_fn
+
+branches = struct(
+    MAIN_ONLY = MAIN_ONLY,
+    STANDARD_RELEASES = STANDARD_RELEASES,
+    ALL_RELEASES = ALL_RELEASES,
+    matches = _matches,
+    exec = _exec,
+    value = _value,
+
+    # Make conditional versions of luci functions that define resources
+    # This does not include any of the service configurations
+    # This also does not include any functions such as recipe that don't
+    # generate config unless they're referred to; it doesn't cause a problem
+    # if they're not referred to
+    **{a: _make_branch_conditional(getattr(luci, a)) for a in (
+        "realm",
+        "binding",
+        "bucket",
+        "builder",
+        "gitiles_poller",
+        "list_view",
+        "list_view_entry",
+        "console_view",
+        "console_view_entry",
+        "external_console_view",
+        "cq_group",
+        "cq_tryjob_verifier",
+    )}
+)

infra/config/lib/builders.star

@@ -27,6 +27,7 @@ through `builders.cpu`, `builders.os` and `builders.goma` respectively.
 
 load("//project.star", "settings")
 load("./args.star", "args")
+load("./branches.star", "branches")
 
 ################################################################################
 # Constants for use with the builder function                                  #
@@ -273,6 +274,7 @@ defaults = args.defaults(
 def builder(
         *,
         name,
+        branch_selector = branches.MAIN_ONLY,
         bucket = args.DEFAULT,
         executable = args.DEFAULT,
         triggered_by = args.DEFAULT,
@@ -317,6 +319,8 @@ def builder(
 
     Arguments:
       * name - name of the builder, will show up in UIs and logs. Required.
+      * branch_selector - A branch selector value controlling whether the
+        builder definition is executed. See branches.star for more information.
       * bucket - a bucket the build is in, see luci.bucket(...) rule. Required
         (may be specified by module-level default).
       * executable - an executable to run, e.g. a luci.recipe(...). Required (may
@@ -527,8 +531,9 @@ def builder(
     if triggered_by != args.COMPUTE:
         kwargs["triggered_by"] = triggered_by
 
-    return luci.builder(
+    return branches.builder(
         name = name,
+        branch_selector = branch_selector,
         dimensions = dimensions,
         properties = properties,
         resultdb_settings = resultdb.settings(

infra/config/lib/ci.star

@@ -16,8 +16,9 @@ to set the default value. Can also be accessed through `ci.defaults`.
 load("@stdlib//internal/graph.star", "graph")
 load("@stdlib//internal/luci/common.star", "keys")
 load("//project.star", "settings")
-load("./builders.star", "builders")
 load("./args.star", "args")
+load("./branches.star", "branches")
+load("./builders.star", "builders")
 
 defaults = args.defaults(
     extends = builders.defaults,
@@ -29,7 +30,10 @@ defaults = args.defaults(
     repo = None,
 )
 
-def declare_bucket(milestone_vars):
+def declare_bucket(milestone_vars, *, branch_selector = branches.MAIN_ONLY):
+    if not branches.matches(branch_selector):
+        return
+
     luci.bucket(
         name = milestone_vars.ci_bucket,
         acls = [
@@ -63,6 +67,7 @@ def declare_bucket(milestone_vars):
     ):
         ci.overview_console_view(
             name = name,
+            branch_selector = branch_selector,
             header = "//chromium-header.textpb",
             repo = "https://chromium.googlesource.com/chromium/src",
             refs = [milestone_vars.ref],
@@ -310,7 +315,7 @@ def ordering(*, short_names = None, categories = None):
         categories = categories or [],
     )
 
-def console_view(*, name, ordering = None, **kwargs):
+def console_view(*, name, branch_selector = branches.MAIN_ONLY, ordering = None, **kwargs):
     """Create a console view, optionally providing an entry ordering.
 
     Args:
@@ -341,6 +346,9 @@ def console_view(*, name, ordering = None, **kwargs):
         `luci.console_view`. The header and repo arguments support
          module-level defaults.
     """
+    if not branches.matches(branch_selector):
+        return
+
     kwargs["header"] = defaults.get_value_from_kwargs("header", kwargs)
     kwargs["repo"] = defaults.get_value_from_kwargs("repo", kwargs)
     luci.console_view(
@@ -353,7 +361,7 @@ def console_view(*, name, ordering = None, **kwargs):
         ordering = ordering or {},
     )
 
-def overview_console_view(*, name, top_level_ordering, **kwargs):
+def overview_console_view(*, name, top_level_ordering, branch_selector = branches.MAIN_ONLY, **kwargs):
     """Create an overview console view.
 
     An overview console view is a console view that contains a subset of
@@ -406,6 +414,7 @@ def console_view_entry(*, category = None, short_name = None):
 def ci_builder(
         *,
         name,
+        branch_selector = branches.MAIN_ONLY,
         add_to_console_view = args.DEFAULT,
         console_view = args.DEFAULT,
         main_console_view = args.DEFAULT,
@@ -418,6 +427,9 @@ def ci_builder(
 
     Arguments:
       name - name of the builder, will show up in UIs and logs. Required.
+      branch_selector - A branch selector value controlling whether the
+        builder definition is executed. See branches.star for more
+        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
@@ -444,6 +456,8 @@ def ci_builder(
         'chromium-tree-closer' config in notifiers.star for the full criteria.
       notifies - Any extra notifiers to attach to this builder.
     """
+    if not branches.matches(branch_selector):
+        return
 
     # Branch builders should never close the tree, only builders from the main
     # "ci" bucket.
@@ -453,8 +467,9 @@ def ci_builder(
 
     # Define the builder first so that any validation of luci.builder arguments
     # (e.g. bucket) occurs before we try to use it
-    ret = builders.builder(
+    builders.builder(
         name = name,
+        branch_selector = branch_selector,
         resultdb_bigquery_exports = [resultdb.export_test_results(
             bq_table = "luci-resultdb.chromium.ci_test_results",
         )],
@@ -487,12 +502,15 @@ def ci_builder(
                     short_name = console_view_entry.short_name,
                 )
 
+            overview_console_category = console_view
+            if console_view_entry.category:
+                overview_console_category = "|".join([console_view, console_view_entry.category])
             main_console_view = defaults.get_value("main_console_view", main_console_view)
             if main_console_view:
                 luci.console_view_entry(
                     builder = builder,
                     console_view = main_console_view,
-                    category = "|".join([console_view, console_view_entry.category]),
+                    category = overview_console_category,
                     short_name = console_view_entry.short_name,
                 )
 
@@ -504,12 +522,10 @@ def ci_builder(
                 luci.console_view_entry(
                     builder = builder,
                     console_view = cq_mirrors_console_view,
-                    category = "|".join([console_view, console_view_entry.category]),
+                    category = overview_console_category,
                     short_name = console_view_entry.short_name,
                 )
 
-    return ret
-
 def android_builder(
         *,
         name,

infra/config/lib/try.star

@@ -19,8 +19,9 @@ to set the default value. Can also be accessed through `try_.defaults`.
 
 load("@stdlib//internal/graph.star", "graph")
 load("@stdlib//internal/luci/common.star", "keys")
-load("./builders.star", "builders")
 load("./args.star", "args")
+load("./branches.star", "branches")
+load("./builders.star", "builders")
 
 DEFAULT_EXCLUDE_REGEXPS = [
     # Contains documentation that doesn't affect the outputs
@@ -37,7 +38,10 @@ defaults = args.defaults(
     main_list_view = None,
 )
 
-def declare_bucket(milestone_vars):
+def declare_bucket(milestone_vars, *, branch_selector = branches.MAIN_ONLY):
+    if not branches.matches(branch_selector):
+        return
+
     luci.bucket(
         name = milestone_vars.try_bucket,
         acls = [
@@ -88,6 +92,7 @@ def declare_bucket(milestone_vars):
 
     try_.list_view(
         name = milestone_vars.main_list_view_name,
+        branch_selector = branch_selector,
         title = milestone_vars.main_list_view_title,
     )
 
@@ -146,8 +151,11 @@ def _sort_console_entries(ctx):
 
 lucicfg.generator(_sort_console_entries)
 
-def list_view(*, name, **kwargs):
-    ret = luci.list_view(
+def list_view(*, name, branch_selector = branches.MAIN_ONLY, **kwargs):
+    if not branches.matches(branch_selector):
+        return
+
+    luci.list_view(
         name = name,
         **kwargs
     )
@@ -156,8 +164,6 @@ def list_view(*, name, **kwargs):
         console_name = name,
     )
 
-    return ret
-
 def tryjob(
         *,
         disable_reuse = None,
@@ -194,6 +200,7 @@ def tryjob(
 def try_builder(
         *,
         name,
+        branch_selector = branches.MAIN_ONLY,
         add_to_list_view = args.DEFAULT,
         cq_group = args.DEFAULT,
         list_view = args.DEFAULT,
@@ -204,6 +211,9 @@ def try_builder(
 
     Arguments:
       name - name of the builder, will show up in UIs and logs. Required.
+      branch_selector - A branch selector value controlling whether the
+        builder definition is executed. See branches.star for more
+        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
@@ -221,11 +231,14 @@ def try_builder(
       tryjob - A struct containing the details of the tryjob verifier for the
         builder, obtained by calling the `tryjob` function.
     """
+    if not branches.matches(branch_selector):
+        return
 
     # Define the builder first so that any validation of luci.builder arguments
     # (e.g. bucket) occurs before we try to use it
-    ret = builders.builder(
+    builders.builder(
         name = name,
+        branch_selector = branch_selector,
         resultdb_bigquery_exports = [resultdb.export_test_results(
             bq_table = "luci-resultdb.chromium.try_test_results",
         )],
@@ -281,8 +294,6 @@ def try_builder(
             list_view = main_list_view,
         )
 
-    return ret
-
 def blink_builder(*, name, goma_backend = None, **kwargs):
     return try_builder(
         name = name,

infra/config/notifiers.star

@@ -2,6 +2,8 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+load("//lib/branches.star", "branches")
+
 luci.notifier(
     name = "chromesec-lkgr-failures",
     on_status_change = True,
@@ -48,23 +50,48 @@ TREE_CLOSING_STEPS = [
     "update",
 ]
 
-luci.tree_closer(
+# This results in a notifier with no recipients, so nothing will actually be
+# notified. This still creates a "notifiable" that can be passed to the notifies
+# argument of a builder, so conditional logic doesn't need to be used when
+# setting the argument and erroneous tree closure notifications won't be sent
+# for failures on branches.
+def _empty_notifier(*, name):
+    luci.notifier(
+        name = name,
+        on_new_status = ["INFRA_FAILURE"],
+    )
+
+def tree_closer(*, name, tree_status_host, **kwargs):
+    if branches.matches(branches.MAIN_ONLY):
+        luci.tree_closer(
+            name = name,
+            tree_status_host = tree_status_host,
+            **kwargs
+        )
+    else:
+        _empty_notifier(name = name)
+
+tree_closer(
     name = "chromium-tree-closer",
     tree_status_host = "chromium-status.appspot.com",
     failed_step_regexp = TREE_CLOSING_STEPS,
 )
 
-luci.tree_closer(
+tree_closer(
     name = "close-on-any-step-failure",
     tree_status_host = "chromium-status.appspot.com",
 )
 
-def tree_closure_notifier(**kwargs):
-    return luci.notifier(
+def tree_closure_notifier(*, name, **kwargs):
+    if branches.matches(branches.MAIN_ONLY):
+        luci.notifier(
+            name = name,
             on_occurrence = ["FAILURE"],
             failed_step_regexp = TREE_CLOSING_STEPS,
             **kwargs
         )
+    else:
+        _empty_notifier(name = name)
 
 tree_closure_notifier(
     name = "chromium-tree-closer-email",

infra/config/subprojects/chromium/ci.star

@@ -2,6 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+load("//lib/branches.star", "branches")
 load("//lib/builders.star", "builder_name", "goma", "os", "xcode_cache")
 load("//lib/ci.star", "ci")
 load("//project.star", "settings")
@@ -17,12 +18,13 @@ ci.set_defaults(
     cq_mirrors_console_view = settings.cq_mirrors_console_name,
 )
 
-ci.declare_bucket(settings)
+ci.declare_bucket(settings, branch_selector = branches.ALL_RELEASES)
 
 # Automatically maintained consoles
 
 ci.console_view(
     name = "chromium",
+    branch_selector = branches.STANDARD_RELEASES,
     include_experimental_builds = True,
     ordering = {
         "*type*": ci.ordering(short_names = ["dbg", "rel", "off"]),
@@ -36,6 +38,7 @@ ci.console_view(
 
 ci.console_view(
     name = "chromium.android",
+    branch_selector = branches.STANDARD_RELEASES,
     ordering = {
         None: ["cronet", "builder", "tester"],
         "*cpu*": ["arm", "arm64", "x86"],
@@ -56,6 +59,7 @@ ci.console_view(
 
 ci.console_view(
     name = "chromium.chromiumos",
+    branch_selector = branches.STANDARD_RELEASES,
     ordering = {
         None: ["default"],
         "default": ci.ordering(short_names = ["ful", "rel"]),
@@ -91,6 +95,7 @@ ci.console_view(
 
 ci.console_view(
     name = "chromium.dawn",
+    branch_selector = branches.STANDARD_RELEASES,
     ordering = {
         None: ["ToT"],
         "*builder*": ["Builder"],
@@ -108,6 +113,7 @@ ci.console_view(
 
 ci.console_view(
     name = "chromium.fyi",
+    branch_selector = branches.STANDARD_RELEASES,
     ordering = {
         None: [
             "closure_compilation",
@@ -172,6 +178,7 @@ ci.console_view(
 
 ci.console_view(
     name = "chromium.gpu",
+    branch_selector = branches.STANDARD_RELEASES,
     ordering = {
         None: ["Windows", "Mac", "Linux"],
     },
@@ -210,6 +217,7 @@ ci.console_view(
 
 ci.console_view(
     name = "chromium.linux",
+    branch_selector = branches.STANDARD_RELEASES,
     ordering = {
         None: ["release", "debug"],
         "release": ci.ordering(short_names = ["bld", "tst", "nsl", "gcc"]),
@@ -219,6 +227,7 @@ ci.console_view(
 
 ci.console_view(
     name = "chromium.mac",
+    branch_selector = branches.STANDARD_RELEASES,
     ordering = {
         None: ["release"],
         "release": ci.ordering(short_names = ["bld"]),
@@ -229,6 +238,7 @@ ci.console_view(
 
 ci.console_view(
     name = "chromium.memory",
+    branch_selector = branches.STANDARD_RELEASES,
     ordering = {
         None: ["win", "mac", "linux", "cros"],
         "*build-or-test*": ci.ordering(short_names = ["bld", "tst"]),
@@ -259,6 +269,7 @@ ci.console_view(
 
 ci.console_view(
     name = "chromium.win",
+    branch_selector = branches.STANDARD_RELEASES,
     ordering = {
         None: ["release", "debug"],
         "debug|builder": ci.ordering(short_names = ["64", "32"]),
@@ -271,6 +282,7 @@ ci.console_view(
 
 ci.android_builder(
     name = "Android WebView M (dbg)",
+    branch_selector = branches.STANDARD_RELEASES,
     console_view_entry = ci.console_view_entry(
         category = "tester|webview",
         short_name = "M",
@@ -280,6 +292,7 @@ ci.android_builder(
 
 ci.android_builder(
     name = "Android WebView N (dbg)",
+    branch_selector = branches.STANDARD_RELEASES,
     console_view_entry = ci.console_view_entry(
         category = "tester|webview",
         short_name = "N",
@@ -289,6 +302,7 @@ ci.android_builder(
 
 ci.android_builder(
     name = "Android WebView O (dbg)",
+    branch_selector = branches.STANDARD_RELEASES,
     console_view_entry = ci.console_view_entry(
         category = "tester|webview",
         short_name = "O",
@@ -298,6 +312,7 @@ ci.android_builder(
 
 ci.android_builder(
     name = "Android WebView P (dbg)",
+    branch_selector = branches.STANDARD_RELEASES,
     console_view_entry = ci.console_view_entry(
         category = "tester|webview",
         short_name = "P",
@@ -307,6 +322,7 @@ ci.android_builder(
 
 ci.android_builder(
     name = "Android arm Builder (dbg)",
+    branch_selector = branches.STANDARD_RELEASES,
     console_view_entry = ci.console_view_entry(
         category = "builder|arm",
         short_name = "32",
@@ -317,6 +333,7 @@ ci.android_builder(
 
 ci.android_builder(
     name = "Android arm64 Builder (dbg)",
+    branch_selector = branches.STANDARD_RELEASES,
     console_view_entry = ci.console_view_entry(
         category = "builder|arm",
         short_name = "64",
@@ -328,6 +345,7 @@ ci.android_builder(
 
 ci.android_builder(
     name = "Android x64 Builder (dbg)",
+    branch_selector = branches.STANDARD_RELEASES,
     console_view_entry = ci.console_view_entry(
         category = "builder|x86",
         short_name = "64",
@@ -337,6 +355,7 @@ ci.android_builder(
 
 ci.android_builder(
     name = "Android x86 Builder (dbg)",
+    branch_selector = branches.STANDARD_RELEASES,
     console_view_entry = ci.console_view_entry(
         category = "builder|x86",
         short_name = "32",
@@ -346,6 +365,7 @@ ci.android_builder(
 
 ci.android_builder(
     name = "Cast Android (dbg)",
+    branch_selector = branches.STANDARD_RELEASES,
     console_view_entry = ci.console_view_entry(
         category = "on_cq",
         short_name = "cst",
@@ -355,6 +375,7 @@ ci.android_builder(
 
 ci.android_builder(
     name = "Marshmallow 64 bit Tester",
+    branch_selector = branches.STANDARD_RELEASES,
     console_view_entry = ci.console_view_entry(
         category = "tester|phone",
         short_name = "M",
@@ -364,6 +385,7 @@ ci.android_builder(
 
 ci.android_builder(
     name = "Nougat Phone Tester",
+    branch_selector = branches.STANDARD_RELEASES,
     console_view_entry = ci.console_view_entry(
         category = "tester|phone",
         short_name = "N",
@@ -373,6 +395,7 @@ ci.android_builder(
 
 ci.android_builder(
     name = "Oreo Phone Tester",
+    branch_selector = branches.STANDARD_RELEASES,
     console_view_entry = ci.console_view_entry(
         category = "tester|phone",
         short_name = "O",
@@ -382,6 +405,7 @@ ci.android_builder(
 
 ci.android_builder(
     name = "android-cronet-arm-dbg",
+    branch_selector = branches.STANDARD_RELEASES,
     console_view_entry = ci.console_view_entry(
         category = "cronet|arm",
         short_name = "dbg",
@@ -391,6 +415,7 @@ ci.android_builder(
 
 ci.android_builder(
     name = "android-cronet-arm-rel",
+    branch_selector = branches.STANDARD_RELEASES,
     console_view_entry = ci.console_view_entry(
         category = "cronet|arm",
         short_name = "rel",
@@ -400,6 +425,7 @@ ci.android_builder(
 
 ci.android_builder(
     name = "android-cronet-kitkat-arm-rel",
+    branch_selector = branches.STANDARD_RELEASES,
     console_view_entry = ci.console_view_entry(
         category = "cronet|test",
         short_name = "k",
@@ -410,6 +436,7 @@ ci.android_builder(
 
 ci.android_builder(
     name = "android-cronet-lollipop-arm-rel",
+    branch_selector = branches.STANDARD_RELEASES,
     console_view_entry = ci.console_view_entry(
         category = "cronet|test",
         short_name = "l",
@@ -420,6 +447,7 @@ ci.android_builder(
 
 ci.android_builder(
     name = "android-lollipop-arm-rel",
+    branch_selector = branches.STANDARD_RELEASES,
     console_view_entry = ci.console_view_entry(
         category = "on_cq",
         short_name = "L",
@@ -429,6 +457,7 @@ ci.android_builder(
 
 ci.android_builder(
     name = "android-marshmallow-arm64-rel",
+    branch_selector = branches.STANDARD_RELEASES,
     console_view_entry = ci.console_view_entry(
         category = "on_cq",
         short_name = "M",
@@ -438,6 +467,7 @@ ci.android_builder(
 
 ci.android_builder(
     name = "android-marshmallow-x86-rel",
+    branch_selector = branches.STANDARD_RELEASES,
     console_view_entry = ci.console_view_entry(
         category = "builder_tester|x86",
         short_name = "M",
@@ -446,6 +476,7 @@ ci.android_builder(
 
 ci.android_builder(
     name = "android-nougat-arm64-rel",
+    branch_selector = branches.STANDARD_RELEASES,
     console_view_entry = ci.console_view_entry(
         category = "builder_tester|arm64",
         short_name = "N",
@@ -454,6 +485,7 @@ ci.android_builder(
 
 ci.android_builder(
     name = "android-pie-arm64-dbg",
+    branch_selector = branches.STANDARD_RELEASES,
     console_view_entry = ci.console_view_entry(
         category = "tester|phone",
         short_name = "P",
@@ -463,6 +495,7 @@ ci.android_builder(
 
 ci.android_builder(
     name = "android-pie-arm64-rel",
+    branch_selector = branches.STANDARD_RELEASES,
     console_view_entry = ci.console_view_entry(
         category = "on_cq",
         short_name = "P",
@@ -472,6 +505,7 @@ ci.android_builder(
 
 ci.chromium_builder(
     name = "android-official",
+    branch_selector = branches.STANDARD_RELEASES,
     main_console_view = settings.main_console_name,
     console_view_entry = ci.console_view_entry(
         category = "android",
@@ -483,6 +517,7 @@ ci.chromium_builder(
 
 ci.chromium_builder(
     name = "fuchsia-official",
+    branch_selector = branches.STANDARD_RELEASES,
     main_console_view = settings.main_console_name,
     console_view_entry = ci.console_view_entry(
         category = "fuchsia",
@@ -497,6 +532,7 @@ ci.chromium_builder(
 
 ci.chromium_builder(
     name = "linux-official",
+    branch_selector = branches.STANDARD_RELEASES,
     builderless = False,
     # TODO(https://crbug.com/1072012) Use the default console view and add
     # main_console_view = settings.main_console_name once the build is green
@@ -514,6 +550,7 @@ ci.chromium_builder(
 
 ci.chromium_builder(
     name = "win-official",
+    branch_selector = branches.STANDARD_RELEASES,
     main_console_view = settings.main_console_name,
     console_view_entry = ci.console_view_entry(
         category = "win|off",
@@ -527,6 +564,7 @@ ci.chromium_builder(
 
 ci.chromium_builder(
     name = "win32-official",
+    branch_selector = branches.STANDARD_RELEASES,
     main_console_view = settings.main_console_name,
     console_view_entry = ci.console_view_entry(
         category = "win|off",
@@ -540,6 +578,7 @@ ci.chromium_builder(
 
 ci.chromiumos_builder(
     name = "chromeos-amd64-generic-dbg",
+    branch_selector = branches.STANDARD_RELEASES,
     console_view_entry = ci.console_view_entry(
         category = "simple|debug|x64",
         short_name = "dbg",
@@ -549,6 +588,7 @@ ci.chromiumos_builder(
 
 ci.chromiumos_builder(
     name = "chromeos-amd64-generic-rel",
+    branch_selector = branches.STANDARD_RELEASES,
     console_view_entry = ci.console_view_entry(
         category = "simple|release|x64",
         short_name = "rel",
@@ -558,6 +598,7 @@ ci.chromiumos_builder(
 
 ci.chromiumos_builder(
     name = "chromeos-arm-generic-rel",
+    branch_selector = branches.STANDARD_RELEASES,
     console_view_entry = ci.console_view_entry(
         category = "simple|release",
         short_name = "arm",
@@ -567,6 +608,7 @@ ci.chromiumos_builder(
 
 ci.chromiumos_builder(
     name = "linux-chromeos-dbg",
+    branch_selector = branches.STANDARD_RELEASES,
     console_view_entry = ci.console_view_entry(
         category = "default",
         short_name = "dbg",
@@ -576,6 +618,7 @@ ci.chromiumos_builder(
 
 ci.chromiumos_builder(
     name = "linux-chromeos-rel",
+    branch_selector = branches.STANDARD_RELEASES,
     console_view_entry = ci.console_view_entry(
         category = "default",
         short_name = "rel",
@@ -585,6 +628,7 @@ ci.chromiumos_builder(
 
 ci.chromiumos_builder(
     name = "linux-lacros-builder-rel",
+    branch_selector = branches.STANDARD_RELEASES,
     console_view_entry = ci.console_view_entry(
         category = "default",
         short_name = "lcr",
@@ -596,6 +640,7 @@ ci.chromiumos_builder(
 
 ci.chromiumos_builder(
     name = "linux-lacros-tester-rel",
+    branch_selector = branches.STANDARD_RELEASES,
     console_view_entry = ci.console_view_entry(
         category = "default",
         short_name = "lcr",
@@ -608,6 +653,7 @@ ci.chromiumos_builder(
 
 ci.dawn_builder(
     name = "Dawn Linux x64 DEPS Builder",
+    branch_selector = branches.STANDARD_RELEASES,
     console_view_entry = ci.console_view_entry(
         category = "DEPS|Linux|Builder",
         short_name = "x64",
@@ -617,6 +663,7 @@ ci.dawn_builder(
 
 ci.dawn_builder(
     name = "Dawn Linux x64 DEPS Release (Intel HD 630)",
+    branch_selector = branches.STANDARD_RELEASES,
     console_view_entry = ci.console_view_entry(
         category = "DEPS|Linux|Intel",
         short_name = "x64",
@@ -629,6 +676,7 @@ ci.dawn_builder(
 
 ci.dawn_builder(
     name = "Dawn Linux x64 DEPS Release (NVIDIA)",
+    branch_selector = branches.STANDARD_RELEASES,
     console_view_entry = ci.console_view_entry(
         category = "DEPS|Linux|Nvidia",
         short_name = "x64",
@@ -641,6 +689,7 @@ ci.dawn_builder(
 
 ci.dawn_builder(
     name = "Dawn Mac x64 DEPS Builder",
+    branch_selector = branches.STANDARD_RELEASES,
     builderless = False,
     console_view_entry = ci.console_view_entry(
         category = "DEPS|Mac|Builder",
@@ -655,6 +704,7 @@ ci.dawn_builder(
 # physical Mac hardware in the Swarming pool which is why they run on linux
 ci.dawn_builder(
     name = "Dawn Mac x64 DEPS Release (AMD)",
+    branch_selector = branches.STANDARD_RELEASES,
     console_view_entry = ci.console_view_entry(
         category = "DEPS|Mac|AMD",
         short_name = "x64",
@@ -667,6 +717,7 @@ ci.dawn_builder(
 
 ci.dawn_builder(
     name = "Dawn Mac x64 DEPS Release (Intel)",
+    branch_selector = branches.STANDARD_RELEASES,
     console_view_entry = ci.console_view_entry(
         category = "DEPS|Mac|Intel",
         short_name = "x64",
@@ -679,6 +730,7 @@ ci.dawn_builder(
 
 ci.dawn_builder(
     name = "Dawn Win10 x64 DEPS Builder",
+    branch_selector = branches.STANDARD_RELEASES,
     console_view_entry = ci.console_view_entry(
         category = "DEPS|Windows|Builder",
         short_name = "x64",
@@ -689,6 +741,7 @@ ci.dawn_builder(
 
 ci.dawn_builder(
     name = "Dawn Win10 x64 DEPS Release (Intel HD 630)",
+    branch_selector = branches.STANDARD_RELEASES,
     console_view_entry = ci.console_view_entry(
         category = "DEPS|Windows|Intel",
         short_name = "x64",
@@ -701,6 +754,7 @@ ci.dawn_builder(
 
 ci.dawn_builder(
     name = "Dawn Win10 x64 DEPS Release (NVIDIA)",
+    branch_selector = branches.STANDARD_RELEASES,
     console_view_entry = ci.console_view_entry(
         category = "DEPS|Windows|Nvidia",
         short_name = "x64",
@@ -713,6 +767,7 @@ ci.dawn_builder(
 
 ci.dawn_builder(
     name = "Dawn Win10 x86 DEPS Builder",
+    branch_selector = branches.STANDARD_RELEASES,
     console_view_entry = ci.console_view_entry(
         category = "DEPS|Windows|Builder",
         short_name = "x86",
@@ -723,6 +778,7 @@ ci.dawn_builder(
 
 ci.dawn_builder(
     name = "Dawn Win10 x86 DEPS Release (Intel HD 630)",
+    branch_selector = branches.STANDARD_RELEASES,
     console_view_entry = ci.console_view_entry(
         category = "DEPS|Windows|Intel",
         short_name = "x86",
@@ -735,6 +791,7 @@ ci.dawn_builder(
 
 ci.dawn_builder(
     name = "Dawn Win10 x86 DEPS Release (NVIDIA)",
+    branch_selector = branches.STANDARD_RELEASES,
     console_view_entry = ci.console_view_entry(
         category = "DEPS|Windows|Nvidia",
         short_name = "x86",
@@ -747,6 +804,7 @@ ci.dawn_builder(
 
 ci.fyi_builder(
     name = "VR Linux",
+    branch_selector = branches.STANDARD_RELEASES,
     console_view_entry = ci.console_view_entry(
         category = "linux",
     ),
@@ -755,6 +813,7 @@ ci.fyi_builder(
 
 ci.fyi_ios_builder(
     name = "ios-simulator-cronet",
+    branch_selector = branches.STANDARD_RELEASES,
     caches = [xcode_cache.x11e146],
     console_view_entry = ci.console_view_entry(
         category = "cronet",
@@ -769,6 +828,7 @@ ci.fyi_ios_builder(
 
 ci.gpu_builder(
     name = "Android Release (Nexus 5X)",
+    branch_selector = branches.STANDARD_RELEASES,
     console_view_entry = ci.console_view_entry(
         category = "Android",
     ),
@@ -776,6 +836,7 @@ ci.gpu_builder(
 
 ci.gpu_builder(
     name = "GPU Linux Builder",
+    branch_selector = branches.STANDARD_RELEASES,
     # TODO(https://crbug.com/1109276) Once support for mastername is removed, do
     # not explicitly set
     builder_group = "chromium.gpu",
@@ -786,6 +847,7 @@ ci.gpu_builder(
 
 ci.gpu_builder(
     name = "GPU Mac Builder",
+    branch_selector = branches.STANDARD_RELEASES,
     console_view_entry = ci.console_view_entry(
         category = "Mac",
     ),
@@ -795,6 +857,7 @@ ci.gpu_builder(
 
 ci.gpu_builder(
     name = "GPU Win x64 Builder",
+    branch_selector = branches.STANDARD_RELEASES,
     builderless = True,
     console_view_entry = ci.console_view_entry(
         category = "Windows",
@@ -804,6 +867,7 @@ ci.gpu_builder(
 
 ci.gpu_thin_tester(
     name = "Linux Release (NVIDIA)",
+    branch_selector = branches.STANDARD_RELEASES,
     # TODO(https://crbug.com/1109276) Once support for mastername is removed, do
     # not explicitly set
     builder_group = "chromium.gpu",
@@ -815,6 +879,7 @@ ci.gpu_thin_tester(
 
 ci.gpu_thin_tester(
     name = "Mac Release (Intel)",
+    branch_selector = branches.STANDARD_RELEASES,
     console_view_entry = ci.console_view_entry(
         category = "Mac",
     ),
@@ -823,6 +888,7 @@ ci.gpu_thin_tester(
 
 ci.gpu_thin_tester(
     name = "Mac Retina Release (AMD)",
+    branch_selector = branches.STANDARD_RELEASES,
     console_view_entry = ci.console_view_entry(
         category = "Mac",
     ),
@@ -831,6 +897,7 @@ ci.gpu_thin_tester(
 
 ci.gpu_thin_tester(
     name = "Win10 x64 Release (NVIDIA)",
+    branch_selector = branches.STANDARD_RELEASES,
     console_view_entry = ci.console_view_entry(
         category = "Windows",
     ),
@@ -839,6 +906,7 @@ ci.gpu_thin_tester(
 
 ci.linux_builder(
     name = "Cast Linux",
+    branch_selector = branches.STANDARD_RELEASES,
     console_view_entry = ci.console_view_entry(
         category = "cast",
         short_name = "vid",
@@ -849,6 +917,7 @@ ci.linux_builder(
 
 ci.linux_builder(
     name = "Fuchsia ARM64",
+    branch_selector = branches.STANDARD_RELEASES,
     console_view_entry = ci.console_view_entry(
         category = "fuchsia|a64",
         short_name = "rel",
@@ -859,6 +928,7 @@ ci.linux_builder(
 
 ci.linux_builder(
     name = "Fuchsia x64",
+    branch_selector = branches.STANDARD_RELEASES,
     console_view_entry = ci.console_view_entry(
         category = "fuchsia|x64",
         short_name = "rel",
@@ -869,6 +939,7 @@ ci.linux_builder(
 
 ci.linux_builder(
     name = "Linux Builder",
+    branch_selector = branches.STANDARD_RELEASES,
     # TODO(https://crbug.com/1109276) Once support for mastername is removed, do
     # not explicitly set
     builder_group = "chromium.linux",
@@ -881,6 +952,7 @@ ci.linux_builder(
 
 ci.linux_builder(
     name = "Linux Builder (dbg)",
+    branch_selector = branches.STANDARD_RELEASES,
     console_view_entry = ci.console_view_entry(
         category = "debug|builder",
         short_name = "64",
@@ -890,6 +962,7 @@ ci.linux_builder(
 
 ci.linux_builder(
     name = "Linux Tests",
+    branch_selector = branches.STANDARD_RELEASES,
     # TODO(https://crbug.com/1109276) Once support for mastername is removed, do
     # not explicitly set
     builder_group = "chromium.linux",
@@ -904,6 +977,7 @@ ci.linux_builder(
 
 ci.linux_builder(
     name = "Linux Tests (dbg)(1)",
+    branch_selector = branches.STANDARD_RELEASES,
     console_view_entry = ci.console_view_entry(
         category = "debug|tester",
         short_name = "64",
@@ -914,6 +988,7 @@ ci.linux_builder(
 
 ci.linux_builder(
     name = "fuchsia-arm64-cast",
+    branch_selector = branches.STANDARD_RELEASES,
     console_view_entry = ci.console_view_entry(
         category = "fuchsia|cast",
         short_name = "a64",
@@ -928,6 +1003,7 @@ ci.linux_builder(
 
 ci.linux_builder(
     name = "fuchsia-x64-cast",
+    branch_selector = branches.STANDARD_RELEASES,
     console_view_entry = ci.console_view_entry(
         category = "fuchsia|cast",
         short_name = "x64",
@@ -942,6 +1018,7 @@ ci.linux_builder(
 
 ci.linux_builder(
     name = "linux-ozone-rel",
+    branch_selector = branches.STANDARD_RELEASES,
     console_view_entry = ci.console_view_entry(
         category = "release",
         short_name = "ozo",
@@ -956,6 +1033,7 @@ ci.linux_builder(
 
 ci.linux_builder(
     name = "Linux Ozone Tester (Headless)",
+    branch_selector = branches.STANDARD_RELEASES,
     console_view = "chromium.fyi",
     console_view_entry = ci.console_view_entry(
         category = "linux",
@@ -967,6 +1045,7 @@ ci.linux_builder(
 
 ci.linux_builder(
     name = "Linux Ozone Tester (Wayland)",
+    branch_selector = branches.STANDARD_RELEASES,
     console_view = "chromium.fyi",
     console_view_entry = ci.console_view_entry(
         category = "linux",
@@ -978,6 +1057,7 @@ ci.linux_builder(
 
 ci.linux_builder(
     name = "Linux Ozone Tester (X11)",
+    branch_selector = branches.STANDARD_RELEASES,
     console_view = "chromium.fyi",
     console_view_entry = ci.console_view_entry(
         category = "linux",
@@ -989,6 +1069,7 @@ ci.linux_builder(
 
 ci.mac_builder(
     name = "Mac Builder",
+    branch_selector = branches.STANDARD_RELEASES,
     console_view_entry = ci.console_view_entry(
         category = "release",
         short_name = "bld",
@@ -999,6 +1080,7 @@ ci.mac_builder(
 
 ci.mac_builder(
     name = "Mac Builder (dbg)",
+    branch_selector = branches.STANDARD_RELEASES,
     console_view_entry = ci.console_view_entry(
         category = "debug",
         short_name = "bld",
@@ -1009,6 +1091,7 @@ ci.mac_builder(
 
 ci.mac_builder(
     name = "mac-arm64-rel",
+    branch_selector = branches.STANDARD_RELEASES,
     console_view_entry = ci.console_view_entry(
         category = "release",
         short_name = "a64",
@@ -1020,6 +1103,7 @@ ci.mac_builder(
 
 ci.thin_tester(
     name = "Mac10.10 Tests",
+    branch_selector = branches.STANDARD_RELEASES,
     mastername = "chromium.mac",
     console_view_entry = ci.console_view_entry(
         category = "release",
@@ -1031,6 +1115,7 @@ ci.thin_tester(
 
 ci.thin_tester(
     name = "Mac10.11 Tests",
+    branch_selector = branches.STANDARD_RELEASES,
     mastername = "chromium.mac",
     console_view_entry = ci.console_view_entry(
         category = "release",
@@ -1042,6 +1127,7 @@ ci.thin_tester(
 
 ci.thin_tester(
     name = "Mac10.12 Tests",
+    branch_selector = branches.STANDARD_RELEASES,
     mastername = "chromium.mac",
     console_view_entry = ci.console_view_entry(
         category = "release",
@@ -1053,6 +1139,7 @@ ci.thin_tester(
 
 ci.thin_tester(
     name = "Mac10.13 Tests",
+    branch_selector = branches.STANDARD_RELEASES,
     mastername = "chromium.mac",
     console_view_entry = ci.console_view_entry(
         category = "release",
@@ -1064,6 +1151,7 @@ ci.thin_tester(
 
 ci.thin_tester(
     name = "Mac10.14 Tests",
+    branch_selector = branches.STANDARD_RELEASES,
     mastername = "chromium.mac",
     console_view_entry = ci.console_view_entry(
         category = "release",
@@ -1075,6 +1163,7 @@ ci.thin_tester(
 
 ci.thin_tester(
     name = "Mac10.15 Tests",
+    branch_selector = branches.STANDARD_RELEASES,
     mastername = "chromium.mac",
     console_view_entry = ci.console_view_entry(
         category = "release",
@@ -1086,6 +1175,7 @@ ci.thin_tester(
 
 ci.thin_tester(
     name = "Mac10.13 Tests (dbg)",
+    branch_selector = branches.STANDARD_RELEASES,
     mastername = "chromium.mac",
     console_view_entry = ci.console_view_entry(
         category = "debug",
@@ -1097,6 +1187,7 @@ ci.thin_tester(
 
 ci.mac_ios_builder(
     name = "ios-simulator",
+    branch_selector = branches.STANDARD_RELEASES,
     console_view_entry = ci.console_view_entry(
         category = "ios|default",
         short_name = "sim",
@@ -1106,6 +1197,7 @@ ci.mac_ios_builder(
 
 ci.mac_ios_builder(
     name = "ios-simulator-full-configs",
+    branch_selector = branches.STANDARD_RELEASES,
     console_view_entry = ci.console_view_entry(
         category = "ios|default",
         short_name = "ful",
@@ -1115,6 +1207,7 @@ ci.mac_ios_builder(
 
 ci.memory_builder(
     name = "Linux ASan LSan Builder",
+    branch_selector = branches.STANDARD_RELEASES,
     console_view_entry = ci.console_view_entry(
         category = "linux|asan lsan",
         short_name = "bld",
@@ -1125,6 +1218,7 @@ ci.memory_builder(
 
 ci.memory_builder(
     name = "Linux ASan LSan Tests (1)",
+    branch_selector = branches.STANDARD_RELEASES,
     console_view_entry = ci.console_view_entry(
         category = "linux|asan lsan",
         short_name = "tst",
@@ -1135,6 +1229,7 @@ ci.memory_builder(
 
 ci.memory_builder(
     name = "Linux ASan Tests (sandboxed)",
+    branch_selector = branches.STANDARD_RELEASES,
     console_view_entry = ci.console_view_entry(
         category = "linux|asan lsan",
         short_name = "sbx",
@@ -1145,6 +1240,7 @@ ci.memory_builder(
 
 ci.memory_builder(
     name = "Linux TSan Builder",
+    branch_selector = branches.STANDARD_RELEASES,
     console_view_entry = ci.console_view_entry(
         category = "linux|TSan v2",
         short_name = "bld",
@@ -1154,6 +1250,7 @@ ci.memory_builder(
 
 ci.memory_builder(
     name = "Linux TSan Tests",
+    branch_selector = branches.STANDARD_RELEASES,
     console_view_entry = ci.console_view_entry(
         category = "linux|TSan v2",
         short_name = "tst",
@@ -1164,6 +1261,7 @@ ci.memory_builder(
 
 ci.win_builder(
     name = "Win7 Tests (dbg)(1)",
+    branch_selector = branches.STANDARD_RELEASES,
     console_view_entry = ci.console_view_entry(
         category = "debug|tester",
         short_name = "7",
@@ -1175,6 +1273,7 @@ ci.win_builder(
 
 ci.win_builder(
     name = "Win 7 Tests x64 (1)",
+    branch_selector = branches.STANDARD_RELEASES,
     console_view_entry = ci.console_view_entry(
         category = "release|tester",
         short_name = "64",
@@ -1186,6 +1285,7 @@ ci.win_builder(
 
 ci.win_builder(
     name = "Win Builder (dbg)",
+    branch_selector = branches.STANDARD_RELEASES,
     console_view_entry = ci.console_view_entry(
         category = "debug|builder",
         short_name = "32",
@@ -1197,6 +1297,7 @@ ci.win_builder(
 
 ci.win_builder(
     name = "Win x64 Builder",
+    branch_selector = branches.STANDARD_RELEASES,
     console_view_entry = ci.console_view_entry(
         category = "release|builder",
         short_name = "64",
@@ -1208,6 +1309,7 @@ ci.win_builder(
 
 ci.win_builder(
     name = "Win10 Tests x64",
+    branch_selector = branches.STANDARD_RELEASES,
     console_view_entry = ci.console_view_entry(
         category = "release|tester",
         short_name = "w10",

infra/config/subprojects/chromium/try.star

@@ -2,11 +2,12 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+load("//lib/branches.star", "branches")
 load("//lib/builders.star", "goma", "os", "xcode_cache")
 load("//lib/try.star", "try_")
 load("//project.star", "settings")
 
-try_.declare_bucket(settings)
+try_.declare_bucket(settings, branch_selector = branches.ALL_RELEASES)
 
 try_.set_defaults(
     settings,
@@ -16,27 +17,64 @@ try_.set_defaults(
 
 # Automatically maintained consoles
 
-[try_.list_view(
-    name = name,
-) for name in (
-    "tryserver.blink",
-    "tryserver.chromium",
-    "tryserver.chromium.android",
-    "tryserver.chromium.angle",
-    "tryserver.chromium.chromiumos",
-    "tryserver.chromium.codesearch",
-    "tryserver.chromium.dawn",
-    "tryserver.chromium.linux",
-    "tryserver.chromium.mac",
-    "tryserver.chromium.swangle",
-    "tryserver.chromium.win",
-)]
+try_.list_view(
+    name = "tryserver.blink",
+    branch_selector = branches.STANDARD_RELEASES,
+)
+
+try_.list_view(
+    name = "tryserver.chromium",
+    branch_selector = branches.STANDARD_RELEASES,
+)
+
+try_.list_view(
+    name = "tryserver.chromium.android",
+    branch_selector = branches.STANDARD_RELEASES,
+)
+
+try_.list_view(
+    name = "tryserver.chromium.angle",
+)
+
+try_.list_view(
+    name = "tryserver.chromium.chromiumos",
+    branch_selector = branches.STANDARD_RELEASES,
+)
+
+try_.list_view(
+    name = "tryserver.chromium.codesearch",
+)
+
+try_.list_view(
+    name = "tryserver.chromium.dawn",
+    branch_selector = branches.STANDARD_RELEASES,
+)
+
+try_.list_view(
+    name = "tryserver.chromium.linux",
+    branch_selector = branches.STANDARD_RELEASES,
+)
+
+try_.list_view(
+    name = "tryserver.chromium.mac",
+    branch_selector = branches.STANDARD_RELEASES,
+)
+
+try_.list_view(
+    name = "tryserver.chromium.swangle",
+)
+
+try_.list_view(
+    name = "tryserver.chromium.win",
+    branch_selector = branches.STANDARD_RELEASES,
+)
 
 # Builders are sorted first lexicographically by the function used to define
 # them, then lexicographically by their name
 
 try_.blink_builder(
     name = "linux-blink-rel",
+    branch_selector = branches.STANDARD_RELEASES,
     goma_backend = goma.backend.RBE_PROD,
     tryjob = try_.job(
         location_regexp = [
@@ -50,31 +88,37 @@ try_.blink_builder(
 
 try_.chromium_builder(
     name = "android-official",
+    branch_selector = branches.STANDARD_RELEASES,
     cores = 32,
 )
 
 try_.chromium_builder(
     name = "fuchsia-official",
+    branch_selector = branches.STANDARD_RELEASES,
     cores = 32,
 )
 
 try_.chromium_builder(
     name = "linux-official",
+    branch_selector = branches.STANDARD_RELEASES,
     cores = 32,
 )
 
 try_.chromium_builder(
     name = "win-official",
+    branch_selector = branches.STANDARD_RELEASES,
     os = os.WINDOWS_DEFAULT,
 )
 
 try_.chromium_builder(
     name = "win32-official",
+    branch_selector = branches.STANDARD_RELEASES,
     os = os.WINDOWS_DEFAULT,
 )
 
 try_.chromium_android_builder(
     name = "android-binary-size",
+    branch_selector = branches.STANDARD_RELEASES,
     executable = "recipe:binary_size_trybot",
     goma_jobs = goma.jobs.J150,
     properties = {
@@ -96,6 +140,7 @@ try_.chromium_android_builder(
 
 try_.chromium_android_builder(
     name = "android-cronet-arm-dbg",
+    branch_selector = branches.STANDARD_RELEASES,
     tryjob = try_.job(
         location_regexp = [
             ".+/[+]/components/cronet/.+",
@@ -111,12 +156,14 @@ try_.chromium_android_builder(
 
 try_.chromium_android_builder(
     name = "android-lollipop-arm-rel",
+    branch_selector = branches.STANDARD_RELEASES,
     goma_jobs = goma.jobs.J150,
     tryjob = try_.job(),
 )
 
 try_.chromium_android_builder(
     name = "android-marshmallow-arm64-rel",
+    branch_selector = branches.STANDARD_RELEASES,
     cores = 16,
     goma_jobs = goma.jobs.J300,
     ssd = True,
@@ -126,6 +173,7 @@ try_.chromium_android_builder(
 
 try_.chromium_android_builder(
     name = "android-marshmallow-x86-rel",
+    branch_selector = branches.STANDARD_RELEASES,
     goma_jobs = goma.jobs.J150,
     tryjob = try_.job(
         experiment_percentage = 5,
@@ -136,11 +184,13 @@ try_.chromium_android_builder(
 # back to NJH47F
 #try_.chromium_android_builder(
 #    name = "android-nougat-arm64-rel",
+#    branch_selector = branches.STANDARD_RELEASES,
 #    goma_jobs = goma.jobs.J150,
 #)
 
 try_.chromium_android_builder(
     name = "android-pie-arm64-dbg",
+    branch_selector = branches.STANDARD_RELEASES,
     goma_jobs = goma.jobs.J300,
     tryjob = try_.job(
         location_regexp = [
@@ -160,6 +210,7 @@ try_.chromium_android_builder(
 
 try_.chromium_android_builder(
     name = "android-pie-arm64-rel",
+    branch_selector = branches.STANDARD_RELEASES,
     cores = 16,
     goma_jobs = goma.jobs.J300,
     ssd = True,
@@ -170,12 +221,14 @@ try_.chromium_android_builder(
 
 try_.chromium_android_builder(
     name = "android_compile_dbg",
+    branch_selector = branches.STANDARD_RELEASES,
     goma_jobs = goma.jobs.J150,
     tryjob = try_.job(),
 )
 
 try_.chromium_android_builder(
     name = "android_compile_x64_dbg",
+    branch_selector = branches.STANDARD_RELEASES,
     tryjob = try_.job(
         location_regexp = [
             ".+/[+]/chrome/android/java/src/org/chromium/chrome/browser/vr/.+",
@@ -192,6 +245,7 @@ try_.chromium_android_builder(
 
 try_.chromium_android_builder(
     name = "android_compile_x86_dbg",
+    branch_selector = branches.STANDARD_RELEASES,
     tryjob = try_.job(
         location_regexp = [
             ".+/[+]/chrome/android/java/src/org/chromium/chrome/browser/vr/.+",
@@ -208,16 +262,19 @@ try_.chromium_android_builder(
 
 try_.chromium_android_builder(
     name = "android_cronet",
+    branch_selector = branches.STANDARD_RELEASES,
     tryjob = try_.job(),
 )
 
 try_.chromium_android_builder(
     name = "cast_shell_android",
+    branch_selector = branches.STANDARD_RELEASES,
     tryjob = try_.job(),
 )
 
 try_.chromium_chromiumos_builder(
     name = "chromeos-amd64-generic-dbg",
+    branch_selector = branches.STANDARD_RELEASES,
     tryjob = try_.job(
         location_regexp = [
             ".+/[+]/content/gpu/.+",
@@ -228,21 +285,25 @@ try_.chromium_chromiumos_builder(
 
 try_.chromium_chromiumos_builder(
     name = "chromeos-amd64-generic-rel",
+    branch_selector = branches.STANDARD_RELEASES,
     tryjob = try_.job(),
 )
 
 try_.chromium_chromiumos_builder(
     name = "chromeos-arm-generic-rel",
+    branch_selector = branches.STANDARD_RELEASES,
     tryjob = try_.job(),
 )
 
 try_.chromium_chromiumos_builder(
     name = "linux-chromeos-compile-dbg",
+    branch_selector = branches.STANDARD_RELEASES,
     tryjob = try_.job(),
 )
 
 try_.chromium_chromiumos_builder(
     name = "linux-chromeos-rel",
+    branch_selector = branches.STANDARD_RELEASES,
     goma_jobs = goma.jobs.J150,
     tryjob = try_.job(cancel_stale = False),
     use_clang_coverage = True,
@@ -250,6 +311,7 @@ try_.chromium_chromiumos_builder(
 
 try_.chromium_dawn_builder(
     name = "dawn-linux-x64-deps-rel",
+    branch_selector = branches.STANDARD_RELEASES,
     tryjob = try_.job(
         location_regexp = [
             ".+/[+]/gpu/.+",
@@ -267,6 +329,7 @@ try_.chromium_dawn_builder(
 
 try_.chromium_dawn_builder(
     name = "dawn-mac-x64-deps-rel",
+    branch_selector = branches.STANDARD_RELEASES,
     os = os.MAC_ANY,
     tryjob = try_.job(
         location_regexp = [
@@ -285,6 +348,7 @@ try_.chromium_dawn_builder(
 
 try_.chromium_dawn_builder(
     name = "dawn-win10-x64-deps-rel",
+    branch_selector = branches.STANDARD_RELEASES,
     os = os.WINDOWS_ANY,
     tryjob = try_.job(
         location_regexp = [
@@ -303,6 +367,7 @@ try_.chromium_dawn_builder(
 
 try_.chromium_dawn_builder(
     name = "dawn-win10-x86-deps-rel",
+    branch_selector = branches.STANDARD_RELEASES,
     os = os.WINDOWS_ANY,
     tryjob = try_.job(
         location_regexp = [
@@ -321,11 +386,13 @@ try_.chromium_dawn_builder(
 
 try_.chromium_linux_builder(
     name = "cast_shell_linux",
+    branch_selector = branches.STANDARD_RELEASES,
     tryjob = try_.job(),
 )
 
 try_.chromium_linux_builder(
     name = "closure_compilation",
+    branch_selector = branches.STANDARD_RELEASES,
     executable = "recipe:closure_compilation",
     tryjob = try_.job(
         location_regexp = [
@@ -336,6 +403,7 @@ try_.chromium_linux_builder(
 
 try_.chromium_linux_builder(
     name = "chromium_presubmit",
+    branch_selector = branches.STANDARD_RELEASES,
     executable = "recipe:presubmit",
     goma_backend = None,
     properties = {
@@ -353,6 +421,7 @@ try_.chromium_linux_builder(
 
 try_.chromium_linux_builder(
     name = "fuchsia-arm64-cast",
+    branch_selector = branches.STANDARD_RELEASES,
     tryjob = try_.job(
         location_regexp = [
             ".+/[+]/chromecast/.+",
@@ -362,32 +431,38 @@ try_.chromium_linux_builder(
 
 try_.chromium_linux_builder(
     name = "fuchsia-x64-cast",
+    branch_selector = branches.STANDARD_RELEASES,
     tryjob = try_.job(),
 )
 
 try_.chromium_linux_builder(
     name = "fuchsia_arm64",
+    branch_selector = branches.STANDARD_RELEASES,
     tryjob = try_.job(),
 )
 
 try_.chromium_linux_builder(
     name = "fuchsia_x64",
+    branch_selector = branches.STANDARD_RELEASES,
     tryjob = try_.job(),
 )
 
 try_.chromium_linux_builder(
     name = "linux-libfuzzer-asan-rel",
+    branch_selector = branches.STANDARD_RELEASES,
     executable = "recipe:chromium_libfuzzer_trybot",
     tryjob = try_.job(),
 )
 
 try_.chromium_linux_builder(
     name = "linux-ozone-rel",
+    branch_selector = branches.STANDARD_RELEASES,
     tryjob = try_.job(),
 )
 
 try_.chromium_linux_builder(
     name = "linux-rel",
+    branch_selector = branches.STANDARD_RELEASES,
     # TODO(https://crbug.com/1109276) Once support for mastername is removed, do
     # not explicitly set
     builder_group = "tryserver.chromium.linux",
@@ -398,6 +473,7 @@ try_.chromium_linux_builder(
 
 try_.chromium_linux_builder(
     name = "linux_chromium_asan_rel_ng",
+    branch_selector = branches.STANDARD_RELEASES,
     goma_jobs = goma.jobs.J150,
     ssd = True,
     tryjob = try_.job(),
@@ -405,6 +481,7 @@ try_.chromium_linux_builder(
 
 try_.chromium_linux_builder(
     name = "linux_chromium_compile_dbg_ng",
+    branch_selector = branches.STANDARD_RELEASES,
     caches = [
         swarming.cache(
             name = "builder",
@@ -417,6 +494,7 @@ try_.chromium_linux_builder(
 
 try_.chromium_linux_builder(
     name = "linux_chromium_dbg_ng",
+    branch_selector = branches.STANDARD_RELEASES,
     caches = [
         swarming.cache(
             name = "builder",
@@ -432,12 +510,14 @@ try_.chromium_linux_builder(
 
 try_.chromium_linux_builder(
     name = "linux_chromium_tsan_rel_ng",
+    branch_selector = branches.STANDARD_RELEASES,
     goma_jobs = goma.jobs.J150,
     tryjob = try_.job(),
 )
 
 try_.chromium_linux_builder(
     name = "linux_layout_tests_composite_after_paint",
+    branch_selector = branches.STANDARD_RELEASES,
     tryjob = try_.job(
         location_regexp = [
             ".+/[+]/third_party/blink/renderer/core/paint/.+",
@@ -450,6 +530,7 @@ try_.chromium_linux_builder(
 
 try_.chromium_linux_builder(
     name = "linux_layout_tests_layout_ng_disabled",
+    branch_selector = branches.STANDARD_RELEASES,
     tryjob = try_.job(
         location_regexp = [
             ".+/[+]/third_party/blink/renderer/core/editing/.+",
@@ -466,6 +547,7 @@ try_.chromium_linux_builder(
 
 try_.chromium_linux_builder(
     name = "linux_vr",
+    branch_selector = branches.STANDARD_RELEASES,
     tryjob = try_.job(
         location_regexp = [
             ".+/[+]/chrome/browser/vr/.+",
@@ -476,6 +558,7 @@ try_.chromium_linux_builder(
 
 try_.chromium_mac_builder(
     name = "mac-rel",
+    branch_selector = branches.STANDARD_RELEASES,
     goma_jobs = goma.jobs.J150,
     os = os.MAC_10_13,
     tryjob = try_.job(),
@@ -483,12 +566,14 @@ try_.chromium_mac_builder(
 
 try_.chromium_mac_builder(
     name = "mac-arm64-rel",
+    branch_selector = branches.STANDARD_RELEASES,
     goma_jobs = goma.jobs.J150,
     os = os.MAC_10_15,
 )
 
 try_.chromium_mac_builder(
     name = "mac_chromium_compile_dbg_ng",
+    branch_selector = branches.STANDARD_RELEASES,
     goma_jobs = goma.jobs.J150,
     os = os.MAC_10_13,
     tryjob = try_.job(),
@@ -496,6 +581,7 @@ try_.chromium_mac_builder(
 
 try_.chromium_mac_ios_builder(
     name = "ios-simulator",
+    branch_selector = branches.STANDARD_RELEASES,
     executable = "recipe:chromium_trybot",
     properties = {
         "xcode_build_version": "12a8189h",
@@ -505,6 +591,7 @@ try_.chromium_mac_ios_builder(
 
 try_.chromium_mac_ios_builder(
     name = "ios-simulator-cronet",
+    branch_selector = branches.STANDARD_RELEASES,
     caches = [xcode_cache.x11e146],
     executable = "recipe:chromium_trybot",
     properties = {
@@ -524,6 +611,7 @@ try_.chromium_mac_ios_builder(
 
 try_.chromium_mac_ios_builder(
     name = "ios-simulator-full-configs",
+    branch_selector = branches.STANDARD_RELEASES,
     executable = "recipe:chromium_trybot",
     tryjob = try_.job(
         location_regexp = [
@@ -534,6 +622,7 @@ try_.chromium_mac_ios_builder(
 
 try_.chromium_win_builder(
     name = "win-libfuzzer-asan-rel",
+    branch_selector = branches.STANDARD_RELEASES,
     builderless = False,
     executable = "recipe:chromium_libfuzzer_trybot",
     os = os.WINDOWS_ANY,
@@ -542,12 +631,14 @@ try_.chromium_win_builder(
 
 try_.chromium_win_builder(
     name = "win_chromium_compile_dbg_ng",
+    branch_selector = branches.STANDARD_RELEASES,
     goma_jobs = goma.jobs.J150,
     tryjob = try_.job(cancel_stale = False),
 )
 
 try_.chromium_win_builder(
     name = "win10_chromium_x64_rel_ng",
+    branch_selector = branches.STANDARD_RELEASES,
     goma_jobs = goma.jobs.J150,
     os = os.WINDOWS_10,
     ssd = True,
@@ -557,6 +648,7 @@ try_.chromium_win_builder(
 
 try_.chromium_win_builder(
     name = "win7-rel",
+    branch_selector = branches.STANDARD_RELEASES,
     execution_timeout = 4 * time.hour + 30 * time.minute,
     goma_jobs = goma.jobs.J300,
     ssd = True,
@@ -569,6 +661,7 @@ try_.chromium_win_builder(
 
 try_.gpu_chromium_android_builder(
     name = "android_optional_gpu_tests_rel",
+    branch_selector = branches.STANDARD_RELEASES,
     tryjob = try_.job(
         location_regexp = [
             ".+/[+]/cc/.+",
@@ -592,6 +685,7 @@ try_.gpu_chromium_android_builder(
 
 try_.gpu_chromium_linux_builder(
     name = "linux_optional_gpu_tests_rel",
+    branch_selector = branches.STANDARD_RELEASES,
     tryjob = try_.job(
         location_regexp = [
             ".+/[+]/chrome/browser/vr/.+",
@@ -613,6 +707,7 @@ try_.gpu_chromium_linux_builder(
 
 try_.gpu_chromium_mac_builder(
     name = "mac_optional_gpu_tests_rel",
+    branch_selector = branches.STANDARD_RELEASES,
     tryjob = try_.job(
         location_regexp = [
             ".+/[+]/chrome/browser/vr/.+",
@@ -635,6 +730,7 @@ try_.gpu_chromium_mac_builder(
 
 try_.gpu_chromium_win_builder(
     name = "win_optional_gpu_tests_rel",
+    branch_selector = branches.STANDARD_RELEASES,
     builderless = True,
     os = os.WINDOWS_DEFAULT,
     tryjob = try_.job(
@@ -664,7 +760,8 @@ try_.gpu_chromium_win_builder(
 # builders run allow only known roller accounts when triggered via the CQ.
 def chrome_internal_verifier(
         *,
-        builder):
+        builder,
+        **kwargs):
     luci.cq_tryjob_verifier(
         builder = "chrome:try/" + builder,
         cq_group = settings.cq_group,
@@ -685,24 +782,30 @@ chrome_internal_verifier(
 
 chrome_internal_verifier(
     builder = "mac-chrome-beta",
+    branch_selector = branches.STANDARD_RELEASES,
 )
 
 chrome_internal_verifier(
     builder = "mac-chrome-stable",
+    branch_selector = branches.STANDARD_RELEASES,
 )
 
 chrome_internal_verifier(
     builder = "win-chrome-beta",
+    branch_selector = branches.STANDARD_RELEASES,
 )
 
 chrome_internal_verifier(
     builder = "win-chrome-stable",
+    branch_selector = branches.STANDARD_RELEASES,
 )
 
 chrome_internal_verifier(
     builder = "win64-chrome-beta",
+    branch_selector = branches.STANDARD_RELEASES,
 )
 
 chrome_internal_verifier(
     builder = "win64-chrome-stable",
+    branch_selector = branches.STANDARD_RELEASES,
 )