Infra: Rename mac-arm64 builder to mac-arm64-rel

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

infra/config/generated/cr-buildbucket.cfg

@@ -11251,6 +11251,33 @@ buckets {
         }
       }
     }
+    builders {
+      name: "mac-arm64-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:mac-arm64-rel"
+      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-code-coverage"
       swarming_host: "chromium-swarm.appspot.com"

infra/config/generated/luci-milo.cfg

@@ -176,10 +176,15 @@ consoles {
     short_name: "15"
   }
   builders {
-    name: "buildbucket/luci.chromium.ci/mac-arm64"
+    name: "buildbucket/luci.chromium.ci/mac-arm64-rel"
     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/WebKit Mac10.13 (retina)"
     category: "chromium.mac|release"
@@ -2208,10 +2213,15 @@ consoles {
     short_name: "15"
   }
   builders {
-    name: "buildbucket/luci.chromium.ci/mac-arm64"
+    name: "buildbucket/luci.chromium.ci/mac-arm64-rel"
     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/WebKit Mac10.13 (retina)"
     category: "chromium.mac|release"
@@ -12240,10 +12250,15 @@ consoles {
     short_name: "15"
   }
   builders {
-    name: "buildbucket/luci.chromium.ci/mac-arm64"
+    name: "buildbucket/luci.chromium.ci/mac-arm64-rel"
     category: "release"
     short_name: "a64"
   }
+  builders {
+    name: "buildbucket/luci.chromium.ci/mac-arm64"
+    category: "release"
+    short_name: "arm"
+  }
   builders {
     name: "buildbucket/luci.chromium.ci/WebKit Mac10.13 (retina)"
     category: "release"

infra/config/generated/luci-notify.cfg

@@ -3017,6 +3017,24 @@ notifiers {
   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
+    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-rel"
     repository: "https://chromium.googlesource.com/chromium/src"
   }
   tree_closers {

infra/config/generated/luci-scheduler.cfg

@@ -11142,13 +11142,13 @@ job {
   }
 }
 job {
-  id: "ci-mac-arm64"
+  id: "ci-mac-arm64-rel"
   realm: "ci"
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
-    builder: "mac-arm64"
+    builder: "mac-arm64-rel"
   }
 }
 job {
@@ -12221,13 +12221,13 @@ job {
   }
 }
 job {
-  id: "mac-arm64"
+  id: "mac-arm64-rel"
   realm: "ci"
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
-    builder: "mac-arm64"
+    builder: "mac-arm64-rel"
   }
 }
 job {
@@ -13065,7 +13065,7 @@ trigger {
   triggers: "linux-wpt-fyi-rel"
   triggers: "mac-archive-dbg"
   triggers: "mac-archive-rel"
-  triggers: "mac-arm64"
+  triggers: "mac-arm64-rel"
   triggers: "mac-code-coverage"
   triggers: "mac-hermetic-upgrade-rel"
   triggers: "mac-mojo-rel"

infra/config/subprojects/chromium/ci.star

@@ -994,8 +994,22 @@ 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(
         category = "release",
         short_name = "a64",

testing/buildbot/waterfalls.pyl

@@ -4430,6 +4430,15 @@
           'isolated_scripts': 'rendering_desktop_representative_perf_tests_isolated_scripts',
         },
       },
+      'mac-arm64-rel': {
+        'additional_compile_targets': [
+          'all',
+        ],
+        'test_suites': {
+          'gtest_tests': 'chromium_mac_gtests_no_nacl',
+          'isolated_scripts': 'chromium_mac_rel_isolated_scripts',
+        },
+      },
     },
   },
   {

tools/mb/mb_config.pyl

@@ -297,7 +297,6 @@
       'linux-perfetto-rel': 'perfetto_release_bot',
       'linux-upload-perfetto': 'release_bot',
       'linux-wpt-fyi-rel': 'release_bot_minimal_symbols',
-      'mac-arm64': 'mac_arm64_release_bot',
       'mac-code-coverage': 'clang_code_coverage',
       'mac-hermetic-upgrade-rel': 'release_bot',
       'mac-mojo-rel': 'release_trybot',
@@ -497,6 +496,7 @@
       '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',
     },
 
     'chromium.memory': {