Infra: Moving mac-arm64 builder from FYI to being part of mac waterfall

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

infra/config/generated/cr-buildbucket.cfg

@@ -11151,8 +11151,8 @@ buckets {
         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.fyi\",\"recipe\":\"chromium\"}"
-      execution_timeout_secs: 36000
+      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 {

infra/config/generated/luci-milo.cfg

@@ -175,6 +175,11 @@ consoles {
     category: "chromium.mac|release"
     short_name: "15"
   }
+  builders {
+    name: "buildbucket/luci.chromium.ci/mac-arm64"
+    category: "chromium.mac|release"
+    short_name: "a64"
+  }
   builders {
     name: "buildbucket/luci.chromium.ci/WebKit Mac10.13 (retina)"
     category: "chromium.mac|release"
@@ -2192,6 +2197,11 @@ consoles {
     category: "chromium.mac|release"
     short_name: "15"
   }
+  builders {
+    name: "buildbucket/luci.chromium.ci/mac-arm64"
+    category: "chromium.mac|release"
+    short_name: "a64"
+  }
   builders {
     name: "buildbucket/luci.chromium.ci/WebKit Mac10.13 (retina)"
     category: "chromium.mac|release"
@@ -2523,11 +2533,6 @@ consoles {
     name: "buildbucket/luci.chromium.ci/ios-simulator-cronet"
     category: "chromium.fyi|cronet"
   }
-  builders {
-    name: "buildbucket/luci.chromium.ci/mac-arm64"
-    category: "chromium.fyi|mac"
-    short_name: "arm64"
-  }
   builders {
     name: "buildbucket/luci.chromium.ci/VR Linux"
     category: "chromium.fyi|linux"
@@ -8059,11 +8064,6 @@ consoles {
     category: "mac"
     short_name: "herm"
   }
-  builders {
-    name: "buildbucket/luci.chromium.ci/mac-arm64"
-    category: "mac"
-    short_name: "arm64"
-  }
   builders {
     name: "buildbucket/luci.chromium.ci/mac-osxbeta-rel"
     category: "mac"
@@ -12197,6 +12197,11 @@ consoles {
     category: "release"
     short_name: "15"
   }
+  builders {
+    name: "buildbucket/luci.chromium.ci/mac-arm64"
+    category: "release"
+    short_name: "a64"
+  }
   builders {
     name: "buildbucket/luci.chromium.ci/WebKit Mac10.13 (retina)"
     category: "release"

infra/config/generated/luci-notify.cfg

@@ -2923,6 +2923,24 @@ 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"
+    }
+  }
+  builders {
+    bucket: "ci"
+    name: "mac-arm64"
+    repository: "https://chromium.googlesource.com/chromium/src"
+  }
+  tree_closers {
+    tree_status_host: "chromium-status.appspot.com"
+    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
+  }
+}
 notifiers {
   notifications {
     on_new_status: FAILURE

infra/config/subprojects/chromium/ci.star

@@ -736,17 +736,6 @@ ci.fyi_builder(
     main_console_view = None,
 )
 
-ci.fyi_builder(
-    name = 'mac-arm64',
-    console_view_entry = ci.console_view_entry(
-        category = 'mac',
-        short_name = 'arm64',
-    ),
-    main_console_view = None,
-    cores = None,
-    os = os.MAC_ANY,
-)
-
 ci.fyi_ios_builder(
     name = 'ios-simulator-cronet',
     console_view_entry = ci.console_view_entry(
@@ -992,6 +981,17 @@ ci.mac_builder(
     os = os.MAC_ANY,
 )
 
+ci.mac_builder(
+    name = 'mac-arm64',
+    console_view_entry = ci.console_view_entry(
+        category = 'release',
+        short_name = 'a64',
+    ),
+    main_console_view = settings.main_console_name,
+    cores = None,
+    os = os.MAC_ANY,
+)
+
 ci.thin_tester(
     name = 'Mac10.10 Tests',
     mastername = 'chromium.mac',

testing/buildbot/chromium.mac.json

@@ -18165,5 +18165,10 @@
     "additional_compile_targets": [
       "all"
     ]
+  },
+  "mac-arm64": {
+    "additional_compile_targets": [
+      "all"
+    ]
   }
 }

testing/buildbot/waterfalls.pyl

@@ -4389,6 +4389,11 @@
         ],
         'test_suites': {},
       },
+      'mac-arm64': {
+        'additional_compile_targets': [
+          'all',
+        ],
+      },
     },
   },
   {

tools/mb/mb_config.pyl

@@ -484,11 +484,12 @@
     'chromium.mac': {
       'Mac Builder': 'gpu_tests_release_bot_minimal_symbols_no_nacl',
       'Mac Builder (dbg)': 'gpu_tests_debug_bot',
+      'WebKit Mac10.13 (retina)': 'release_bot',
       'ios-device': 'ios_device_release_rbe_compile_only',
       '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',
-      'WebKit Mac10.13 (retina)': 'release_bot',
+      'mac-arm64': 'mac_arm64_release_bot',
     },
 
     'chromium.memory': {