Infra: Removing old mac-arm64 builder

Bug: 1106950
Change-Id: I620b2e38047f9f5ea89afc9cd764d908b8ad677f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2343486Reviewed-by: Garrett Beaty <gbeaty@chromium.org>
Commit-Queue: Gary Tong <gatong@chromium.org>
Cr-Commit-Position: refs/heads/master@{#796453}

infra/config/generated/cr-buildbucket.cfg

@@ -11195,33 +11195,6 @@ buckets {
         }
       }
     }
-    builders {
-      name: "mac-arm64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "builder:mac-arm64"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.chromium.ci"
-      exe {
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        cmd: "recipes"
-      }
-      properties: "{\"$build/chromium_tests\":{\"bucketed_triggers\":true},\"$build/goma\":{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"mastername\":\"chromium.mac\",\"recipe\":\"chromium\"}"
-      execution_timeout_secs: 10800
-      build_numbers: YES
-      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "luci-resultdb"
-          dataset: "chromium"
-          table: "ci_test_results"
-          test_results {}
-        }
-      }
-    }
     builders {
       name: "mac-arm64-rel"
       swarming_host: "chromium-swarm.appspot.com"

infra/config/generated/luci-milo.cfg

@@ -180,11 +180,6 @@ consoles {
     category: "chromium.mac|release"
     short_name: "a64"
   }
-  builders {
-    name: "buildbucket/luci.chromium.ci/mac-arm64"
-    category: "chromium.mac|release"
-    short_name: "arm"
-  }
   builders {
     name: "buildbucket/luci.chromium.ci/Mac Builder (dbg)"
     category: "chromium.mac|debug"
@@ -2207,11 +2202,6 @@ consoles {
     category: "chromium.mac|release"
     short_name: "a64"
   }
-  builders {
-    name: "buildbucket/luci.chromium.ci/mac-arm64"
-    category: "chromium.mac|release"
-    short_name: "arm"
-  }
   builders {
     name: "buildbucket/luci.chromium.ci/Mac Builder (dbg)"
     category: "chromium.mac|debug"
@@ -12226,11 +12216,6 @@ consoles {
     category: "release"
     short_name: "a64"
   }
-  builders {
-    name: "buildbucket/luci.chromium.ci/mac-arm64"
-    category: "release"
-    short_name: "arm"
-  }
   builders {
     name: "buildbucket/luci.chromium.ci/Mac Builder (dbg)"
     category: "debug"

infra/config/generated/luci-notify.cfg

@@ -3013,24 +3013,6 @@ notifiers {
     failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
   }
 }
-notifiers {
-  notifications {
-    on_occurrence: FAILURE
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-    email {
-      rotation_urls: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
-    }
-    template: "tree_closure_email_template"
-  }
-  builders {
-    bucket: "ci"
-    name: "mac-arm64"
-  }
-  tree_closers {
-    tree_status_host: "chromium-status.appspot.com"
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-  }
-}
 notifiers {
   notifications {
     on_occurrence: FAILURE

infra/config/subprojects/chromium/ci.star

@@ -994,20 +994,6 @@ ci.mac_builder(
     os = os.MAC_ANY,
 )
 
-# TODO(https://crbug.com/1106950): Builder moved to mac-arm64-rel.  Remove
-# this builder after the CL lands.
-ci.mac_builder(
-    name = "mac-arm64",
-    console_view_entry = ci.console_view_entry(
-        category = "release",
-        short_name = "arm",
-    ),
-    main_console_view = settings.main_console_name,
-    cores = None,
-    os = os.MAC_ANY,
-    triggered_by = [],
-)
-
 ci.mac_builder(
     name = "mac-arm64-rel",
     console_view_entry = ci.console_view_entry(

testing/buildbot/waterfalls.pyl

@@ -4384,24 +4384,6 @@
         ],
         'test_suites': {},
       },
-      'mac-arm64': {
-        'additional_compile_targets': [
-          'all',
-        ],
-        'os_type': 'mac',
-        'browser_config': 'release',
-        # TODO(thakis): This mixin is almost certainly incorrect. It exists to
-        # make the test suites listed below be valid; this can't be generated
-        # swarming dimensions are set.
-        'mixins': [
-          'mac_mini_intel_gpu_stable',
-        ],
-        'test_suites': {
-          'gtest_tests': 'gpu_fyi_mac_release_gtests',
-          'gpu_telemetry_tests': 'gpu_fyi_mac_release_telemetry_tests',
-          'isolated_scripts': 'rendering_desktop_representative_perf_tests_isolated_scripts',
-        },
-      },
       'mac-arm64-rel': {
         'additional_compile_targets': [
           'all',

tools/mb/mb_config.pyl

@@ -494,7 +494,6 @@
       'ios-simulator': 'ios_simulator_debug_static_rbe_bot',
       'ios-simulator-full-configs': 'ios_simulator_debug_static_bot',
       'ios-simulator-noncq': 'ios_simulator_debug_static_rbe_bot',
-      'mac-arm64': 'mac_arm64_release_bot',
       'mac-arm64-rel': 'mac_arm64_release_bot',
     },