[ci] Switch remaining macOS host tests to LUCI (#7063)

* [ci] Switch remaining macOS host tests to LUCI Enables the new LUCI versions of the remaining Cirrus macOS host tests, and removes the Cirrus versions. This completes the macOS LUCI transition for flutter/plugins, leaving only Linux on Cirrus. * standardize naming as macos_
flutter · Jan 31, 2023 · ddb9777 · ddb9777
1 parent d39e756
commit ddb9777
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 56 deletions.
diff --git a/.ci.yaml b/.ci.yaml
@@ -61,7 +61,7 @@ targets:
     properties:
       add_recipes_cq: "true"
       version_file: flutter_master.version
-      target_file: mac_lint_podspecs.yaml
+      target_file: macos_lint_podspecs.yaml
 
   ### macOS desktop tasks ###
   # macos-platform_tests builds all the plugins on ARM, so this build is run
@@ -72,7 +72,7 @@ targets:
     properties:
       add_recipes_cq: "true"
       version_file: flutter_master.version
-      target_file: mac_build_all_plugins.yaml
+      target_file: macos_build_all_plugins.yaml
       channel: master
 
   - name: Mac_x64 build_all_plugins stable
@@ -81,11 +81,10 @@ targets:
     properties:
       add_recipes_cq: "true"
       version_file: flutter_stable.version
-      target_file: mac_build_all_plugins.yaml
+      target_file: macos_build_all_plugins.yaml
       channel: stable
 
   - name: Mac_arm64 macos_platform_tests master
-    bringup: true # New task
     recipe: plugins/plugins
     timeout: 60
     properties:
@@ -95,7 +94,6 @@ targets:
       target_file: macos_platform_tests.yaml
 
   - name: Mac_arm64 macos_platform_tests stable
-    bringup: true # New task
     recipe: plugins/plugins
     presubmit: false
     timeout: 60
@@ -110,7 +108,6 @@ targets:
   # once simulator tests are reliable on the ARM infrastructure. See discussion
   # at https://github.com/flutter/plugins/pull/5693#issuecomment-1126011089
   - name: Mac_arm64 ios_build_all_plugins master
-    bringup: true # New task
     recipe: plugins/plugins
     timeout: 30
     properties:
@@ -120,7 +117,6 @@ targets:
       target_file: ios_build_all_plugins.yaml
 
   - name: Mac_arm64 ios_build_all_plugins stable
-    bringup: true # New task
     recipe: plugins/plugins
     timeout: 30
     properties:

diff --git a/.ci/targets/mac_build_all_plugins.yaml → .ci/targets/macos_build_all_plugins.yaml b/.ci/targets/mac_build_all_plugins.yaml → .ci/targets/macos_build_all_plugins.yaml
diff --git a/.ci/targets/mac_lint_podspecs.yaml → .ci/targets/macos_lint_podspecs.yaml b/.ci/targets/mac_lint_podspecs.yaml → .ci/targets/macos_lint_podspecs.yaml
diff --git a/.ci/targets/mac_platform_tests.yaml → .ci/targets/macos_platform_tests.yaml b/.ci/targets/mac_platform_tests.yaml → .ci/targets/macos_platform_tests.yaml
diff --git a/.cirrus.yml b/.cirrus.yml
@@ -22,21 +22,6 @@ tool_setup_template: &TOOL_SETUP_TEMPLATE
   tool_setup_script:
     - .ci/scripts/prepare_tool.sh
 
-macos_template: &MACOS_TEMPLATE
-  # Only one macOS task can run in parallel without credits, so use them for
-  # PRs on macOS.
-  use_compute_credits: $CIRRUS_USER_COLLABORATOR == 'true'
-
-macos_intel_template: &MACOS_INTEL_TEMPLATE
-  << : *MACOS_TEMPLATE
-  osx_instance:
-    image: big-sur-xcode-13
-
-macos_arm_template: &MACOS_ARM_TEMPLATE
-  << : *MACOS_TEMPLATE
-  macos_instance:
-    image: ghcr.io/cirruslabs/macos-ventura-xcode:14
-
 flutter_upgrade_template: &FLUTTER_UPGRADE_TEMPLATE
   upgrade_flutter_script:
     # Channels that are part of our normal test matrix use a pinned,
@@ -306,37 +291,3 @@ task:
         - ./script/tool_runner.sh build-examples --web
       drive_script:
         - ./script/tool_runner.sh drive-examples --web --exclude=script/configs/exclude_integration_web.yaml
-
-# ARM macOS tasks.
-task:
-  << : *MACOS_ARM_TEMPLATE
-  << : *FLUTTER_UPGRADE_TEMPLATE
-  matrix:
-    ### iOS tasks ###
-    - name: ios-build_all_plugins
-      env:
-        BUILD_ALL_ARGS: "ios --no-codesign"
-        matrix:
-          CHANNEL: "master"
-          CHANNEL: "stable"
-      << : *BUILD_ALL_PLUGINS_APP_TEMPLATE
-    ### macOS desktop tasks ###
-    - name: macos-platform_tests
-      # Don't run full platform tests on both channels in pre-submit.
-      skip: $CIRRUS_PR != '' && $CHANNEL == 'stable'
-      env:
-        matrix:
-          CHANNEL: "master"
-          CHANNEL: "stable"
-        PATH: $PATH:/usr/local/bin
-      build_script:
-        - ./script/tool_runner.sh build-examples --macos
-      xcode_analyze_script:
-        - ./script/tool_runner.sh xcode-analyze --macos
-      xcode_analyze_deprecation_script:
-        # Ensure we don't accidentally introduce deprecated code.
-        - ./script/tool_runner.sh xcode-analyze --macos --macos-min-version=12.3
-      native_test_script:
-        - ./script/tool_runner.sh native-test --macos
-      drive_script:
-        - ./script/tool_runner.sh drive-examples --macos --exclude=script/configs/exclude_integration_macos.yaml