Turn down M85 builders.

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

infra/config/generated/realms.cfg

@@ -72,26 +72,6 @@ realms {
     principals: "group:project-chromium-ci-schedulers"
   }
 }
-realms {
-  name: "ci-m85"
-  bindings {
-    role: "role/buildbucket.builderServiceAccount"
-    principals: "user:chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-    principals: "user:chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
-  }
-  bindings {
-    role: "role/buildbucket.owner"
-    principals: "group:google/luci-task-force@google.com"
-  }
-  bindings {
-    role: "role/buildbucket.reader"
-    principals: "group:all"
-  }
-  bindings {
-    role: "role/buildbucket.triggerer"
-    principals: "group:project-chromium-ci-schedulers"
-  }
-}
 realms {
   name: "codesearch"
   bindings {
@@ -155,7 +135,6 @@ realms {
   name: "pools/ci"
   bindings {
     role: "role/swarming.poolUser"
-    principals: "project:chromium-m85"
     principals: "project:chromium-m86"
     principals: "project:chromium-m87"
   }
@@ -199,7 +178,6 @@ realms {
   bindings {
     role: "role/swarming.poolUser"
     principals: "group:chromium-led-users"
-    principals: "project:chromium-m85"
     principals: "project:chromium-m86"
     principals: "project:chromium-m87"
     principals: "user:infra-try-recipes-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -251,35 +229,6 @@ realms {
     principals: "user:infra-try-recipes-tester@chops-service-accounts.iam.gserviceaccount.com"
   }
 }
-realms {
-  name: "try-m85"
-  bindings {
-    role: "role/buildbucket.builderServiceAccount"
-    principals: "user:chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-    principals: "user:chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
-  }
-  bindings {
-    role: "role/buildbucket.owner"
-    principals: "group:service-account-chromium-tryserver"
-  }
-  bindings {
-    role: "role/buildbucket.reader"
-    principals: "group:all"
-  }
-  bindings {
-    role: "role/buildbucket.triggerer"
-    principals: "group:project-chromium-tryjob-access"
-    principals: "group:service-account-chromeperf"
-    principals: "group:service-account-cq"
-    principals: "user:findit-for-me@appspot.gserviceaccount.com"
-    principals: "user:tricium-prod@appspot.gserviceaccount.com"
-  }
-  bindings {
-    role: "role/swarming.taskTriggerer"
-    principals: "group:chromium-led-users"
-    principals: "user:infra-try-recipes-tester@chops-service-accounts.iam.gserviceaccount.com"
-  }
-}
 realms {
   name: "webrtc"
   bindings {

infra/config/generators/scheduler-noop-jobs.star

@@ -16,22 +16,6 @@ without error.
 load("@stdlib//internal/luci/proto.star", "scheduler_pb")
 load("//project.star", "settings")
 
-# For the chromium project (settings.is_master is True), we have bucket-based
-# milestones for <=M85. We create a no-op job that prefixes the ci bucket name
-# for those milestones. Combined with setting the bucketed_triggers property,
-# this makes it safe to issue triggers for the builders that don't exist for the
-# milestone.
-# For the chromium milestone projects (settings.is_master is False), the
-# milestone project will use the same bucket names, so we create a no-op job for
-# the 'ci' bucket.
-_BRANCH_NOOP_CONFIG = struct(
-    buckets = ["ci-m85"],
-    fmt = "{bucket}-{builder}",
-) if settings.is_master else struct(
-    buckets = ["ci"],
-    fmt = "{builder}",
-)
-
 _NON_BRANCHED_TESTERS = (
     # This tester is triggered by 'Mac Builder', but it is an FYI builder and
     # not mirrored by any branched try builders, so we do not need to run it on
@@ -59,17 +43,19 @@ _NON_BRANCHED_TESTERS = (
 )
 
 _TESTER_NOOP_JOBS = [scheduler_pb.Job(
-    id = _BRANCH_NOOP_CONFIG.fmt.format(bucket = bucket, builder = builder),
+    id = builder,
     schedule = "triggered",
-    acl_sets = [bucket],
+    acl_sets = ["ci"],
     acls = [scheduler_pb.Acl(
         role = scheduler_pb.Acl.TRIGGERER,
         granted_to = "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com",
     )],
     noop = scheduler_pb.NoopTask(),
-) for builder in _NON_BRANCHED_TESTERS for bucket in _BRANCH_NOOP_CONFIG.buckets]
+) for builder in _NON_BRANCHED_TESTERS]
 
 def _add_noop_jobs(ctx):
+    if settings.is_master:
+        return
     cfg = ctx.output["luci-scheduler.cfg"]
     for j in _TESTER_NOOP_JOBS:
         cfg.job.append(j)

infra/config/outages/outages.star

@@ -34,7 +34,7 @@ def _disable_cq_experiments(ctx):
             if not b.experiment_percentage:
                 continue
             project, bucket, builder = b.name.split("/", 2)
-            if project == "chromium" and bucket in ("try", "try-m85"):
+            if project == "chromium" and bucket == "try":
                 b.includable_only = True
                 b.experiment_percentage = 0
                 b.location_regexp.clear()

infra/config/project.star

@@ -47,7 +47,6 @@ lucicfg.generator(_generate_project_pyl)
 # https://chromiumdash.appspot.com/branches
 # The 2 highest milestones will be the ones with active branches
 ACTIVE_BRANCHES = [
-    ("m85", 4183),
     ("m86", 4240),
     ("m87", 4280),
 ]

infra/config/subprojects/chromium/subproject.star

@@ -9,10 +9,6 @@ exec("./try.star")
 exec("./gpu.try.star")
 exec("./swangle.try.star")
 
-# Execute the M85 config
-branches.exec("./versioned/m85/buckets/ci.star")
-branches.exec("./versioned/m85/buckets/try.star")
-
 # TODO(gbeaty) external_console_view uses new fields/types that aren't present
 # in the version of the protobuf that lint-luci-milo uses, so update protos and
 # then uncomment these (the main console is still reachable via the beta link in

infra/config/subprojects/chromium/versioned/README.md

-This directory supports our branch CI/CQ configuration.
-
-Contents:
-
-* **m84**, **m85**
-  * contains subdirectories that contain the versioned configuration for the
-  active milestones
-  * non-dimension changes should be infrequent
-  * more recent milestones will use separate project instead

infra/config/subprojects/chromium/versioned/m85/vars.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.
-
-vars = struct(
-    is_master = False,
-    ref = "refs/branch-heads/4183",
-    ci_bucket = "ci-m85",
-    ci_poller = "m85-gitiles-trigger",
-    main_console_name = "main-m85",
-    main_console_title = "Chromium M85 Console",
-    cq_mirrors_console_name = "mirrors-m85",
-    cq_mirrors_console_title = "Chromium M85 CQ Mirrors Console",
-    try_bucket = "try-m85",
-    try_triggering_projects = [],
-    cq_group = "cq-m85",
-    cq_ref_regexp = "refs/branch-heads/4183",
-    main_list_view_name = "try-m85",
-    main_list_view_title = "Chromium M85 CQ console",
-    tree_status_host = None,
-)

infra/config/swarming.star

@@ -83,20 +83,6 @@ swarming.task_triggerers(
     ],
 )
 
-# LED users that can trigger try builds via LED.
-swarming.task_triggerers(
-    builder_realm = "try-m85",
-    pool_realm = "pools/try",
-    groups = [
-        "chromium-led-users",
-    ],
-    users = [
-        # An account used by "Build Recipes Tester" builder infra/try bucket
-        # used to tests changes to Chromium recipes using LED before commit.
-        "infra-try-recipes-tester@chops-service-accounts.iam.gserviceaccount.com",
-    ],
-)
-
 # Realm with bots that run isolated tests.
 #
 # Tasks here are triggered directly on Swarming (not via Buildbucket) by various