Upgrade macOS and xcode for staging M1 tests

Change-Id: I66fdea3dd43d05c2f2b95b1ad42fc3abdf231a2a
Bug: https://github.com/flutter/flutter/issues/87508
Reviewed-on: https://flutter-review.googlesource.com/c/infra/+/28182
Reviewed-by: Jenn Magder <magder@google.com>
Commit-Queue: Keyong Han <keyonghan@google.com>
diff --git a/config/devicelab_staging_config.star b/config/devicelab_staging_config.star
index facbbf3..7ca7c49 100644
--- a/config/devicelab_staging_config.star
+++ b/config/devicelab_staging_config.star
@@ -16,7 +16,7 @@
 
 # Global OS variables
 LINUX_OS = "Debian"
-MAC_OS = "Mac-12.0.1"
+MAC_OS = "Mac-12"
 WINDOWS_OS = "Windows-10"
 XCODE_VERSION = "13a233"  # xcode 13
 IOS_VERSION = "iOS-15.1"
@@ -342,14 +342,14 @@
                 "use_cas": True,
                 "upload_metrics": True,
                 "$flutter/osx_sdk": {
-                    "sdk_version": "12c33",
+                    "sdk_version": XCODE_VERSION,
                 },
             },
             category = "Mac_arm64",
             bucket = "staging",
             pool = "luci.flutter.staging",
             caches = MAC_DEFAULT_CACHES,
-            os = "Mac-11",
+            os = MAC_OS,
             dimensions = {"device_os": "none", "mac_model": "Macmini9,1"},
         )
 
diff --git a/config/generated/flutter/luci/cr-buildbucket.cfg b/config/generated/flutter/luci/cr-buildbucket.cfg
index 1f858da..c323db0 100644
--- a/config/generated/flutter/luci/cr-buildbucket.cfg
+++ b/config/generated/flutter/luci/cr-buildbucket.cfg
@@ -110829,7 +110829,7 @@
       name: "Mac_android_staging drive_perf_debug_warning"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "device_os:N"
-      dimensions: "os:Mac-12.0.1"
+      dimensions: "os:Mac-12"
       dimensions: "pool:luci.flutter.staging"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -110916,7 +110916,7 @@
       name: "Mac_android_staging hello_world_android__compile"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "device_os:N"
-      dimensions: "os:Mac-12.0.1"
+      dimensions: "os:Mac-12"
       dimensions: "pool:luci.flutter.staging"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -111003,7 +111003,7 @@
       name: "Mac_android_staging hot_mode_dev_cycle__benchmark"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "device_os:N"
-      dimensions: "os:Mac-12.0.1"
+      dimensions: "os:Mac-12"
       dimensions: "pool:luci.flutter.staging"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -111090,7 +111090,7 @@
       name: "Mac_android_staging integration_test_test"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "device_os:N"
-      dimensions: "os:Mac-12.0.1"
+      dimensions: "os:Mac-12"
       dimensions: "pool:luci.flutter.staging"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -111177,7 +111177,7 @@
       name: "Mac_android_staging integration_ui_frame_number"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "device_os:N"
-      dimensions: "os:Mac-12.0.1"
+      dimensions: "os:Mac-12"
       dimensions: "pool:luci.flutter.staging"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -111264,7 +111264,7 @@
       name: "Mac_android_staging run_release_test"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "device_os:N"
-      dimensions: "os:Mac-12.0.1"
+      dimensions: "os:Mac-12"
       dimensions: "pool:luci.flutter.staging"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -111352,7 +111352,7 @@
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "device_os:none"
       dimensions: "mac_model:Macmini9,1"
-      dimensions: "os:Mac-11"
+      dimensions: "os:Mac-12"
       dimensions: "pool:luci.flutter.staging"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -111362,7 +111362,7 @@
       properties:
         '{'
         '  "$flutter/osx_sdk": {'
-        '    "sdk_version": "12c33"'
+        '    "sdk_version": "13a233"'
         '  },'
         '  "$fuchsia/goma": {'
         '    "server": "rbe-prod1.endpoints.fuchsia-infra-goma-prod.cloud.goog"'
@@ -111434,7 +111434,7 @@
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "device_os:none"
       dimensions: "mac_model:Macmini9,1"
-      dimensions: "os:Mac-11"
+      dimensions: "os:Mac-12"
       dimensions: "pool:luci.flutter.staging"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -111444,7 +111444,7 @@
       properties:
         '{'
         '  "$flutter/osx_sdk": {'
-        '    "sdk_version": "12c33"'
+        '    "sdk_version": "13a233"'
         '  },'
         '  "$fuchsia/goma": {'
         '    "server": "rbe-prod1.endpoints.fuchsia-infra-goma-prod.cloud.goog"'
@@ -111516,7 +111516,7 @@
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "device_os:none"
       dimensions: "mac_model:Macmini9,1"
-      dimensions: "os:Mac-11"
+      dimensions: "os:Mac-12"
       dimensions: "pool:luci.flutter.staging"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -111526,7 +111526,7 @@
       properties:
         '{'
         '  "$flutter/osx_sdk": {'
-        '    "sdk_version": "12c33"'
+        '    "sdk_version": "13a233"'
         '  },'
         '  "$fuchsia/goma": {'
         '    "server": "rbe-prod1.endpoints.fuchsia-infra-goma-prod.cloud.goog"'
@@ -111598,7 +111598,7 @@
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "device_os:none"
       dimensions: "mac_model:Macmini9,1"
-      dimensions: "os:Mac-11"
+      dimensions: "os:Mac-12"
       dimensions: "pool:luci.flutter.staging"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -111608,7 +111608,7 @@
       properties:
         '{'
         '  "$flutter/osx_sdk": {'
-        '    "sdk_version": "12c33"'
+        '    "sdk_version": "13a233"'
         '  },'
         '  "$fuchsia/goma": {'
         '    "server": "rbe-prod1.endpoints.fuchsia-infra-goma-prod.cloud.goog"'
@@ -111680,7 +111680,7 @@
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "device_os:none"
       dimensions: "mac_model:Macmini9,1"
-      dimensions: "os:Mac-11"
+      dimensions: "os:Mac-12"
       dimensions: "pool:luci.flutter.staging"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -111690,7 +111690,7 @@
       properties:
         '{'
         '  "$flutter/osx_sdk": {'
-        '    "sdk_version": "12c33"'
+        '    "sdk_version": "13a233"'
         '  },'
         '  "$fuchsia/goma": {'
         '    "server": "rbe-prod1.endpoints.fuchsia-infra-goma-prod.cloud.goog"'
@@ -111762,7 +111762,7 @@
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "device_os:none"
       dimensions: "mac_model:Macmini9,1"
-      dimensions: "os:Mac-11"
+      dimensions: "os:Mac-12"
       dimensions: "pool:luci.flutter.staging"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -111772,7 +111772,7 @@
       properties:
         '{'
         '  "$flutter/osx_sdk": {'
-        '    "sdk_version": "12c33"'
+        '    "sdk_version": "13a233"'
         '  },'
         '  "$fuchsia/goma": {'
         '    "server": "rbe-prod1.endpoints.fuchsia-infra-goma-prod.cloud.goog"'
@@ -111844,7 +111844,7 @@
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "device_os:none"
       dimensions: "mac_model:Macmini9,1"
-      dimensions: "os:Mac-11"
+      dimensions: "os:Mac-12"
       dimensions: "pool:luci.flutter.staging"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -111854,7 +111854,7 @@
       properties:
         '{'
         '  "$flutter/osx_sdk": {'
-        '    "sdk_version": "12c33"'
+        '    "sdk_version": "13a233"'
         '  },'
         '  "$fuchsia/goma": {'
         '    "server": "rbe-prod1.endpoints.fuchsia-infra-goma-prod.cloud.goog"'
@@ -111926,7 +111926,7 @@
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "device_os:none"
       dimensions: "mac_model:Macmini9,1"
-      dimensions: "os:Mac-11"
+      dimensions: "os:Mac-12"
       dimensions: "pool:luci.flutter.staging"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -111936,7 +111936,7 @@
       properties:
         '{'
         '  "$flutter/osx_sdk": {'
-        '    "sdk_version": "12c33"'
+        '    "sdk_version": "13a233"'
         '  },'
         '  "$fuchsia/goma": {'
         '    "server": "rbe-prod1.endpoints.fuchsia-infra-goma-prod.cloud.goog"'
@@ -112008,7 +112008,7 @@
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "device_os:none"
       dimensions: "mac_model:Macmini9,1"
-      dimensions: "os:Mac-11"
+      dimensions: "os:Mac-12"
       dimensions: "pool:luci.flutter.staging"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -112018,7 +112018,7 @@
       properties:
         '{'
         '  "$flutter/osx_sdk": {'
-        '    "sdk_version": "12c33"'
+        '    "sdk_version": "13a233"'
         '  },'
         '  "$fuchsia/goma": {'
         '    "server": "rbe-prod1.endpoints.fuchsia-infra-goma-prod.cloud.goog"'
@@ -112090,7 +112090,7 @@
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "device_os:none"
       dimensions: "mac_model:Macmini9,1"
-      dimensions: "os:Mac-11"
+      dimensions: "os:Mac-12"
       dimensions: "pool:luci.flutter.staging"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -112100,7 +112100,7 @@
       properties:
         '{'
         '  "$flutter/osx_sdk": {'
-        '    "sdk_version": "12c33"'
+        '    "sdk_version": "13a233"'
         '  },'
         '  "$fuchsia/goma": {'
         '    "server": "rbe-prod1.endpoints.fuchsia-infra-goma-prod.cloud.goog"'
@@ -112172,7 +112172,7 @@
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "device_os:none"
       dimensions: "mac_model:Macmini9,1"
-      dimensions: "os:Mac-11"
+      dimensions: "os:Mac-12"
       dimensions: "pool:luci.flutter.staging"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -112182,7 +112182,7 @@
       properties:
         '{'
         '  "$flutter/osx_sdk": {'
-        '    "sdk_version": "12c33"'
+        '    "sdk_version": "13a233"'
         '  },'
         '  "$fuchsia/goma": {'
         '    "server": "rbe-prod1.endpoints.fuchsia-infra-goma-prod.cloud.goog"'
@@ -112254,7 +112254,7 @@
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "device_os:none"
       dimensions: "mac_model:Macmini9,1"
-      dimensions: "os:Mac-11"
+      dimensions: "os:Mac-12"
       dimensions: "pool:luci.flutter.staging"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -112264,7 +112264,7 @@
       properties:
         '{'
         '  "$flutter/osx_sdk": {'
-        '    "sdk_version": "12c33"'
+        '    "sdk_version": "13a233"'
         '  },'
         '  "$fuchsia/goma": {'
         '    "server": "rbe-prod1.endpoints.fuchsia-infra-goma-prod.cloud.goog"'
@@ -112336,7 +112336,7 @@
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "device_os:none"
       dimensions: "mac_model:Macmini9,1"
-      dimensions: "os:Mac-11"
+      dimensions: "os:Mac-12"
       dimensions: "pool:luci.flutter.staging"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -112346,7 +112346,7 @@
       properties:
         '{'
         '  "$flutter/osx_sdk": {'
-        '    "sdk_version": "12c33"'
+        '    "sdk_version": "13a233"'
         '  },'
         '  "$fuchsia/goma": {'
         '    "server": "rbe-prod1.endpoints.fuchsia-infra-goma-prod.cloud.goog"'
@@ -112418,7 +112418,7 @@
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "device_os:none"
       dimensions: "mac_model:Macmini9,1"
-      dimensions: "os:Mac-11"
+      dimensions: "os:Mac-12"
       dimensions: "pool:luci.flutter.staging"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -112428,7 +112428,7 @@
       properties:
         '{'
         '  "$flutter/osx_sdk": {'
-        '    "sdk_version": "12c33"'
+        '    "sdk_version": "13a233"'
         '  },'
         '  "$fuchsia/goma": {'
         '    "server": "rbe-prod1.endpoints.fuchsia-infra-goma-prod.cloud.goog"'
@@ -112499,7 +112499,7 @@
       name: "Mac_ios flutter_gallery__transition_perf_e2e_ios"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "device_os:iOS-15.1"
-      dimensions: "os:Mac-12.0.1"
+      dimensions: "os:Mac-12"
       dimensions: "pool:luci.flutter.staging"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -112585,7 +112585,7 @@
       name: "Mac_ios flutter_gallery_ios__transition_perf"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "device_os:iOS-15.1"
-      dimensions: "os:Mac-12.0.1"
+      dimensions: "os:Mac-12"
       dimensions: "pool:luci.flutter.staging"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -112671,7 +112671,7 @@
       name: "Mac_ios flutter_gallery_ios_sksl_warmup__transition_perf"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "device_os:iOS-15.1"
-      dimensions: "os:Mac-12.0.1"
+      dimensions: "os:Mac-12"
       dimensions: "pool:luci.flutter.staging"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -113581,7 +113581,7 @@
       name: "Mac_ios_staging animation_with_microtasks_perf_ios__timeline_summary"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "device_os:iOS-15.1"
-      dimensions: "os:Mac-12.0.1"
+      dimensions: "os:Mac-12"
       dimensions: "pool:luci.flutter.staging"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -113667,7 +113667,7 @@
       name: "Mac_ios_staging backdrop_filter_perf_ios__timeline_summary"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "device_os:iOS-15.1"
-      dimensions: "os:Mac-12.0.1"
+      dimensions: "os:Mac-12"
       dimensions: "pool:luci.flutter.staging"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -113753,7 +113753,7 @@
       name: "Mac_ios_staging basic_material_app_ios__compile"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "device_os:iOS-15.1"
-      dimensions: "os:Mac-12.0.1"
+      dimensions: "os:Mac-12"
       dimensions: "pool:luci.flutter.staging"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -113839,7 +113839,7 @@
       name: "Mac_ios_staging channels_integration_test_ios"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "device_os:iOS-15.1"
-      dimensions: "os:Mac-12.0.1"
+      dimensions: "os:Mac-12"
       dimensions: "pool:luci.flutter.staging"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -113925,7 +113925,7 @@
       name: "Mac_ios_staging complex_layout_ios__compile"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "device_os:iOS-15.1"
-      dimensions: "os:Mac-12.0.1"
+      dimensions: "os:Mac-12"
       dimensions: "pool:luci.flutter.staging"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -114011,7 +114011,7 @@
       name: "Mac_ios_staging complex_layout_ios__start_up"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "device_os:iOS-15.1"
-      dimensions: "os:Mac-12.0.1"
+      dimensions: "os:Mac-12"
       dimensions: "pool:luci.flutter.staging"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -114097,7 +114097,7 @@
       name: "Mac_ios_staging complex_layout_scroll_perf_ios__timeline_summary"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "device_os:iOS-15.1"
-      dimensions: "os:Mac-12.0.1"
+      dimensions: "os:Mac-12"
       dimensions: "pool:luci.flutter.staging"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -114183,7 +114183,7 @@
       name: "Mac_ios_staging external_ui_integration_test_ios"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "device_os:iOS-15.1"
-      dimensions: "os:Mac-12.0.1"
+      dimensions: "os:Mac-12"
       dimensions: "pool:luci.flutter.staging"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -114269,7 +114269,7 @@
       name: "Mac_ios_staging flavors_test_ios"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "device_os:iOS-15.1"
-      dimensions: "os:Mac-12.0.1"
+      dimensions: "os:Mac-12"
       dimensions: "pool:luci.flutter.staging"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -114355,7 +114355,7 @@
       name: "Mac_ios_staging flutter_gallery_ios__compile"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "device_os:iOS-15.1"
-      dimensions: "os:Mac-12.0.1"
+      dimensions: "os:Mac-12"
       dimensions: "pool:luci.flutter.staging"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -114441,7 +114441,7 @@
       name: "Mac_ios_staging flutter_gallery_ios__start_up"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "device_os:iOS-15.1"
-      dimensions: "os:Mac-12.0.1"
+      dimensions: "os:Mac-12"
       dimensions: "pool:luci.flutter.staging"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -114527,7 +114527,7 @@
       name: "Mac_ios_staging flutter_view_ios__start_up"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "device_os:iOS-15.1"
-      dimensions: "os:Mac-12.0.1"
+      dimensions: "os:Mac-12"
       dimensions: "pool:luci.flutter.staging"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -114613,7 +114613,7 @@
       name: "Mac_ios_staging hello_world_ios__compile"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "device_os:iOS-15.1"
-      dimensions: "os:Mac-12.0.1"
+      dimensions: "os:Mac-12"
       dimensions: "pool:luci.flutter.staging"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -114699,7 +114699,7 @@
       name: "Mac_ios_staging hot_mode_dev_cycle_macos_target__benchmark"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "device_os:iOS-15.1"
-      dimensions: "os:Mac-12.0.1"
+      dimensions: "os:Mac-12"
       dimensions: "pool:luci.flutter.staging"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -114785,7 +114785,7 @@
       name: "Mac_ios_staging integration_test_test_ios"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "device_os:iOS-15.1"
-      dimensions: "os:Mac-12.0.1"
+      dimensions: "os:Mac-12"
       dimensions: "pool:luci.flutter.staging"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -114871,7 +114871,7 @@
       name: "Mac_ios_staging integration_ui_ios_driver"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "device_os:iOS-15.1"
-      dimensions: "os:Mac-12.0.1"
+      dimensions: "os:Mac-12"
       dimensions: "pool:luci.flutter.staging"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -114957,7 +114957,7 @@
       name: "Mac_ios_staging integration_ui_ios_frame_number"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "device_os:iOS-15.1"
-      dimensions: "os:Mac-12.0.1"
+      dimensions: "os:Mac-12"
       dimensions: "pool:luci.flutter.staging"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -115043,7 +115043,7 @@
       name: "Mac_ios_staging integration_ui_ios_keyboard_resize"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "device_os:iOS-15.1"
-      dimensions: "os:Mac-12.0.1"
+      dimensions: "os:Mac-12"
       dimensions: "pool:luci.flutter.staging"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -115129,7 +115129,7 @@
       name: "Mac_ios_staging integration_ui_ios_screenshot"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "device_os:iOS-15.1"
-      dimensions: "os:Mac-12.0.1"
+      dimensions: "os:Mac-12"
       dimensions: "pool:luci.flutter.staging"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -115215,7 +115215,7 @@
       name: "Mac_ios_staging integration_ui_ios_textfield"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "device_os:iOS-15.1"
-      dimensions: "os:Mac-12.0.1"
+      dimensions: "os:Mac-12"
       dimensions: "pool:luci.flutter.staging"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -115301,7 +115301,7 @@
       name: "Mac_ios_staging ios_app_with_extensions_test"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "device_os:iOS-15.1"
-      dimensions: "os:Mac-12.0.1"
+      dimensions: "os:Mac-12"
       dimensions: "pool:luci.flutter.staging"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -115387,7 +115387,7 @@
       name: "Mac_ios_staging ios_content_validation_test"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "device_os:iOS-15.1"
-      dimensions: "os:Mac-12.0.1"
+      dimensions: "os:Mac-12"
       dimensions: "pool:luci.flutter.staging"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -115473,7 +115473,7 @@
       name: "Mac_ios_staging ios_defines_test"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "device_os:iOS-15.1"
-      dimensions: "os:Mac-12.0.1"
+      dimensions: "os:Mac-12"
       dimensions: "pool:luci.flutter.staging"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -115559,7 +115559,7 @@
       name: "Mac_ios_staging ios_platform_view_tests"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "device_os:iOS-15.1"
-      dimensions: "os:Mac-12.0.1"
+      dimensions: "os:Mac-12"
       dimensions: "pool:luci.flutter.staging"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -115645,7 +115645,7 @@
       name: "Mac_ios_staging large_image_changer_perf_ios"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "device_os:iOS-15.1"
-      dimensions: "os:Mac-12.0.1"
+      dimensions: "os:Mac-12"
       dimensions: "pool:luci.flutter.staging"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -115731,7 +115731,7 @@
       name: "Mac_ios_staging macos_chrome_dev_mode"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "device_os:iOS-15.1"
-      dimensions: "os:Mac-12.0.1"
+      dimensions: "os:Mac-12"
       dimensions: "pool:luci.flutter.staging"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -115817,7 +115817,7 @@
       name: "Mac_ios_staging microbenchmarks_ios"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "device_os:iOS-15.1"
-      dimensions: "os:Mac-12.0.1"
+      dimensions: "os:Mac-12"
       dimensions: "pool:luci.flutter.staging"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -115903,7 +115903,7 @@
       name: "Mac_ios_staging new_gallery_ios__transition_perf"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "device_os:iOS-15.1"
-      dimensions: "os:Mac-12.0.1"
+      dimensions: "os:Mac-12"
       dimensions: "pool:luci.flutter.staging"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -115989,7 +115989,7 @@
       name: "Mac_ios_staging platform_channel_sample_test_ios"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "device_os:iOS-15.1"
-      dimensions: "os:Mac-12.0.1"
+      dimensions: "os:Mac-12"
       dimensions: "pool:luci.flutter.staging"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -116075,7 +116075,7 @@
       name: "Mac_ios_staging platform_channel_sample_test_swift"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "device_os:iOS-15.1"
-      dimensions: "os:Mac-12.0.1"
+      dimensions: "os:Mac-12"
       dimensions: "pool:luci.flutter.staging"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -116161,7 +116161,7 @@
       name: "Mac_ios_staging platform_interaction_test_ios"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "device_os:iOS-15.1"
-      dimensions: "os:Mac-12.0.1"
+      dimensions: "os:Mac-12"
       dimensions: "pool:luci.flutter.staging"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -116247,7 +116247,7 @@
       name: "Mac_ios_staging platform_view_ios__start_up"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "device_os:iOS-15.1"
-      dimensions: "os:Mac-12.0.1"
+      dimensions: "os:Mac-12"
       dimensions: "pool:luci.flutter.staging"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -116333,7 +116333,7 @@
       name: "Mac_ios_staging platform_views_scroll_perf_ios__timeline_summary"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "device_os:iOS-15.1"
-      dimensions: "os:Mac-12.0.1"
+      dimensions: "os:Mac-12"
       dimensions: "pool:luci.flutter.staging"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -116419,7 +116419,7 @@
       name: "Mac_ios_staging post_backdrop_filter_perf_ios__timeline_summary"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "device_os:iOS-15.1"
-      dimensions: "os:Mac-12.0.1"
+      dimensions: "os:Mac-12"
       dimensions: "pool:luci.flutter.staging"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -116505,7 +116505,7 @@
       name: "Mac_ios_staging simple_animation_perf_ios"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "device_os:iOS-15.1"
-      dimensions: "os:Mac-12.0.1"
+      dimensions: "os:Mac-12"
       dimensions: "pool:luci.flutter.staging"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -116591,7 +116591,7 @@
       name: "Mac_ios_staging smoke_catalina_hot_mode_dev_cycle_ios__benchmark"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "device_os:iOS-15.1"
-      dimensions: "os:Mac-12.0.1"
+      dimensions: "os:Mac-12"
       dimensions: "pool:luci.flutter.staging"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -116677,7 +116677,7 @@
       name: "Mac_ios_staging tiles_scroll_perf_ios__timeline_summary"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "device_os:iOS-15.1"
-      dimensions: "os:Mac-12.0.1"
+      dimensions: "os:Mac-12"
       dimensions: "pool:luci.flutter.staging"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
diff --git a/config/generated/flutter/luci/project.cfg b/config/generated/flutter/luci/project.cfg
index 53d147b..1b70f14 100644
--- a/config/generated/flutter/luci/project.cfg
+++ b/config/generated/flutter/luci/project.cfg
@@ -7,7 +7,7 @@
 name: "flutter"
 access: "group:all"
 lucicfg {
-  version: "1.30.9"
+  version: "1.30.10"
   package_dir: "../../.."
   config_dir: "generated/flutter/luci"
   entry_point: "main.star"