[ci] Complete architecture switch for iOS

.ci.yaml

@@ -64,7 +64,7 @@ targets:
       target_file: macos_lint_podspecs.yaml
 
   ### macOS desktop tasks ###
-  # macos-platform_tests builds all the plugins on ARM, so this build is run
+  # macos_platform_tests builds all the plugins on ARM, so this build is run
   # on Intel to give us build coverage of both host types.
   - name: Mac_x64 build_all_plugins master
     recipe: plugins/plugins
@@ -104,29 +104,9 @@ targets:
       target_file: macos_platform_tests.yaml
 
   ### iOS tasks ###
-  # TODO(stuartmorgan): Swap the architecture of this and ios_platform_tests_*
-  # 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
-    recipe: plugins/plugins
-    timeout: 30
-    properties:
-      channel: master
-      add_recipes_cq: "true"
-      version_file: flutter_master.version
-      target_file: ios_build_all_plugins.yaml
-
-  - name: Mac_arm64 ios_build_all_plugins stable
-    recipe: plugins/plugins
-    timeout: 30
-    properties:
-      channel: stable
-      add_recipes_cq: "true"
-      version_file: flutter_stable.version
-      target_file: ios_build_all_plugins.yaml
-
+  # ios_platform_tests builds all the plugins on ARM, so this build is run
+  # on Intel to give us build coverage of both host types.
   - name: Mac_x64 ios_build_all_plugins master
-    bringup: true # New task, replaces ARM version
     recipe: plugins/plugins
     timeout: 30
     properties:
@@ -136,7 +116,6 @@ targets:
       target_file: ios_build_all_plugins.yaml
 
   - name: Mac_x64 ios_build_all_plugins stable
-    bringup: true # New task, replaces ARM version
     recipe: plugins/plugins
     timeout: 30
     properties:
@@ -145,145 +124,59 @@ targets:
       version_file: flutter_stable.version
       target_file: ios_build_all_plugins.yaml
 
-  # TODO(stuartmorgan): Swap the architecture of this and ios_build_all_plugins
-  # once simulator tests are reliable on the ARM infrastructure. See discussion
-  # at https://github.com/flutter/plugins/pull/5693#issuecomment-1126011089
-  - name: Mac_x64 ios_platform_tests_1_of_4 master
-    recipe: plugins/plugins
-    timeout: 60
-    properties:
-      add_recipes_cq: "true"
-      version_file: flutter_master.version
-      target_file: ios_platform_tests.yaml
-      package_sharding: "--shardIndex 0 --shardCount 4"
-
-  - name: Mac_x64 ios_platform_tests_2_of_4 master
-    recipe: plugins/plugins
-    timeout: 60
-    properties:
-      add_recipes_cq: "true"
-      version_file: flutter_master.version
-      target_file: ios_platform_tests.yaml
-      package_sharding: "--shardIndex 1 --shardCount 4"
-
-  - name: Mac_x64 ios_platform_tests_3_of_4 master
-    recipe: plugins/plugins
-    timeout: 60
-    properties:
-      add_recipes_cq: "true"
-      version_file: flutter_master.version
-      target_file: ios_platform_tests.yaml
-      package_sharding: "--shardIndex 2 --shardCount 4"
-
-  - name: Mac_x64 ios_platform_tests_4_of_4 master
-    recipe: plugins/plugins
-    timeout: 60
-    properties:
-      add_recipes_cq: "true"
-      version_file: flutter_master.version
-      target_file: ios_platform_tests.yaml
-      package_sharding: "--shardIndex 3 --shardCount 4"
-
+  # TODO(stuartmorgan): Change all of the ios_platform_tests_* task timeouts
+  # to 60 minutes once https://github.com/flutter/flutter/issues/119750 is
+  # fixed.
   - name: Mac_arm64 ios_platform_tests_shard_1 master - plugins
-    bringup: true # New task; will replace Intel version
     recipe: plugins/plugins
-    timeout: 60
+    timeout: 120
     properties:
       add_recipes_cq: "true"
       version_file: flutter_master.version
       target_file: ios_platform_tests.yaml
       package_sharding: "--shardIndex 0 --shardCount 5"
 
   - name: Mac_arm64 ios_platform_tests_shard_2 master - plugins
-    bringup: true # New task; will replace Intel version
     recipe: plugins/plugins
-    timeout: 60
+    timeout: 120
     properties:
       add_recipes_cq: "true"
       version_file: flutter_master.version
       target_file: ios_platform_tests.yaml
       package_sharding: "--shardIndex 1 --shardCount 5"
 
   - name: Mac_arm64 ios_platform_tests_shard_3 master - plugins
-    bringup: true # New task; will replace Intel version
     recipe: plugins/plugins
-    timeout: 60
+    timeout: 120
     properties:
       add_recipes_cq: "true"
       version_file: flutter_master.version
       target_file: ios_platform_tests.yaml
       package_sharding: "--shardIndex 2 --shardCount 5"
 
   - name: Mac_arm64 ios_platform_tests_shard_4 master - plugins
-    bringup: true # New task; will replace Intel version
     recipe: plugins/plugins
-    timeout: 60
+    timeout: 120
     properties:
       add_recipes_cq: "true"
       version_file: flutter_master.version
       target_file: ios_platform_tests.yaml
       package_sharding: "--shardIndex 3 --shardCount 5"
 
   - name: Mac_arm64 ios_platform_tests_shard_5 master - plugins
-    bringup: true # New task; will replace Intel version
     recipe: plugins/plugins
-    timeout: 60
+    timeout: 120
     properties:
       add_recipes_cq: "true"
       version_file: flutter_master.version
       target_file: ios_platform_tests.yaml
       package_sharding: "--shardIndex 4 --shardCount 5"
 
   # Don't run full platform tests on both channels in pre-submit.
-  - name: Mac_x64 ios_platform_tests_1_of_4 stable
-    recipe: plugins/plugins
-    presubmit: false
-    timeout: 60
-    properties:
-      channel: stable
-      add_recipes_cq: "true"
-      version_file: flutter_stable.version
-      target_file: ios_platform_tests.yaml
-      package_sharding: "--shardIndex 0 --shardCount 4"
-
-  - name: Mac_x64 ios_platform_tests_2_of_4 stable
-    recipe: plugins/plugins
-    presubmit: false
-    timeout: 60
-    properties:
-      channel: stable
-      add_recipes_cq: "true"
-      version_file: flutter_stable.version
-      target_file: ios_platform_tests.yaml
-      package_sharding: "--shardIndex 1 --shardCount 4"
-
-  - name: Mac_x64 ios_platform_tests_3_of_4 stable
-    recipe: plugins/plugins
-    presubmit: false
-    timeout: 60
-    properties:
-      channel: stable
-      add_recipes_cq: "true"
-      version_file: flutter_stable.version
-      target_file: ios_platform_tests.yaml
-      package_sharding: "--shardIndex 2 --shardCount 4"
-
-  - name: Mac_x64 ios_platform_tests_4_of_4 stable
-    recipe: plugins/plugins
-    presubmit: false
-    timeout: 60
-    properties:
-      channel: stable
-      add_recipes_cq: "true"
-      version_file: flutter_stable.version
-      target_file: ios_platform_tests.yaml
-      package_sharding: "--shardIndex 3 --shardCount 4"
-
   - name: Mac_arm64 ios_platform_tests_shard_1 stable - plugins
-    bringup: true # New task; will replace Intel version
     recipe: plugins/plugins
     presubmit: false
-    timeout: 60
+    timeout: 120
     properties:
       channel: stable
       add_recipes_cq: "true"
@@ -292,10 +185,9 @@ targets:
       package_sharding: "--shardIndex 0 --shardCount 5"
 
   - name: Mac_arm64 ios_platform_tests_shard_2 stable - plugins
-    bringup: true # New task; will replace Intel version
     recipe: plugins/plugins
     presubmit: false
-    timeout: 60
+    timeout: 120
     properties:
       channel: stable
       add_recipes_cq: "true"
@@ -304,10 +196,9 @@ targets:
       package_sharding: "--shardIndex 1 --shardCount 5"
 
   - name: Mac_arm64 ios_platform_tests_shard_3 stable - plugins
-    bringup: true # New task; will replace Intel version
     recipe: plugins/plugins
     presubmit: false
-    timeout: 60
+    timeout: 120
     properties:
       channel: stable
       add_recipes_cq: "true"
@@ -316,10 +207,9 @@ targets:
       package_sharding: "--shardIndex 2 --shardCount 5"
 
   - name: Mac_arm64 ios_platform_tests_shard_4 stable - plugins
-    bringup: true # New task; will replace Intel version
     recipe: plugins/plugins
     presubmit: false
-    timeout: 60
+    timeout: 120
     properties:
       channel: stable
       add_recipes_cq: "true"
@@ -328,10 +218,9 @@ targets:
       package_sharding: "--shardIndex 3 --shardCount 5"
 
   - name: Mac_arm64 ios_platform_tests_shard_5 stable - plugins
-    bringup: true # New task; will replace Intel version
     recipe: plugins/plugins
     presubmit: false
-    timeout: 60
+    timeout: 120
     properties:
       channel: stable
       add_recipes_cq: "true"