[M110][infra] Don't branch ci/linux-chromeos-annotator-rel.

ci/linux-chromeos-annotator-rel is in the chromium.fyi builder group,
which shouldn't be branched in general. This builder was demoted to FYI,
so this was most likely just an oversight when the definition was moved
between files.

(cherry picked from commit b345f7b)

Change-Id: I9e4f444edf7458b44deb542ca4ec3ceb3bf8f3d2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4112670
Commit-Queue: Garrett Beaty <gbeaty@google.com>
Reviewed-by: Ben Pastene <bpastene@chromium.org>
Cr-Original-Commit-Position: refs/heads/main@{#1088302}
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4148568
Commit-Queue: Ben Pastene <bpastene@chromium.org>
Auto-Submit: Garrett Beaty <gbeaty@google.com>
Cr-Commit-Position: refs/branch-heads/5481@{#189}
Cr-Branched-From: 130f3e4-refs/heads/main@{#1084008}

infra/config/generated/luci/cr-buildbucket.cfg

@@ -7819,98 +7819,6 @@ buckets {
         }
       }
     }
-    builders {
-      name: "linux-chromeos-annotator-rel"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builderless:1"
-      dimensions: "cores:8"
-      dimensions: "cpu:x86-64"
-      dimensions: "free_space:standard"
-      dimensions: "os:Ubuntu-18.04"
-      dimensions: "pool:luci.chromium.ci"
-      dimensions: "ssd:0"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/ci/linux-chromeos-annotator-rel/properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5481",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "chromium.fyi",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium",'
-        '  "sheriff_rotations": ['
-        '    "chrome_browser_release"'
-        '  ]'
-        '}'
-      priority: 35
-      execution_timeout_secs: 10800
-      build_numbers: YES
-      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.buildbucket.omit_python2"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "ci_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-    }
     builders {
       name: "linux-chromeos-dbg"
       swarming_host: "chromium-swarm.appspot.com"

infra/config/generated/luci/luci-milo.cfg

@@ -491,11 +491,6 @@ consoles {
     name: "buildbucket/luci.chromium-m110.ci/VR Linux"
     category: "chromium.fyi|linux"
   }
-  builders {
-    name: "buildbucket/luci.chromium-m110.ci/linux-chromeos-annotator-rel"
-    category: "chromium.fyi|release"
-    short_name: "rel"
-  }
   header {
     oncalls {
       name: "Chromium Branches"
@@ -1611,11 +1606,6 @@ consoles {
     name: "buildbucket/luci.chromium-m110.ci/VR Linux"
     category: "linux"
   }
-  builders {
-    name: "buildbucket/luci.chromium-m110.ci/linux-chromeos-annotator-rel"
-    category: "release"
-    short_name: "rel"
-  }
   header {
     oncalls {
       name: "Chromium Branches"

infra/config/generated/luci/luci-scheduler.cfg

@@ -778,15 +778,6 @@ job {
     builder: "lacros-arm64-generic-rel"
   }
 }
-job {
-  id: "linux-chromeos-annotator-rel"
-  realm: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "linux-chromeos-annotator-rel"
-  }
-}
 job {
   id: "linux-chromeos-dbg"
   realm: "ci"
@@ -952,7 +943,6 @@ trigger {
   triggers: "lacros-amd64-generic-rel"
   triggers: "lacros-arm-generic-rel"
   triggers: "lacros-arm64-generic-rel"
-  triggers: "linux-chromeos-annotator-rel"
   triggers: "linux-chromeos-dbg"
   triggers: "linux-chromeos-rel"
   triggers: "linux-lacros-builder-rel"

infra/config/generated/luci/project.cfg

@@ -7,7 +7,7 @@
 name: "chromium-m110"
 access: "group:all"
 lucicfg {
-  version: "1.35.3"
+  version: "1.37.0"
   package_dir: "../.."
   config_dir: "generated/luci"
   entry_point: "main.star"

infra/config/subprojects/chromium/ci/chromium.fyi.star

@@ -390,7 +390,6 @@ ci.builder(
 
 ci.builder(
     name = "linux-chromeos-annotator-rel",
-    branch_selector = branches.STANDARD_MILESTONE,
     builder_spec = builder_config.builder_spec(
         gclient_config = builder_config.gclient_config(
             config = "chromium",