From a78d8220ae3fe8e6002369a6a13dde314aac3018 Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Tue, 31 Jan 2023 09:01:54 -0500 Subject: [PATCH 1/2] [ci] Complete architecture switch for iOS Enables the new architecture tests for iOS and turns down the old ones. Platform tests are now run on ARM, and the build-all test is run on Intel for coverage of building on both architectures. --- .ci.yaml | 120 ++----------------------------------------------------- 1 file changed, 3 insertions(+), 117 deletions(-) diff --git a/.ci.yaml b/.ci.yaml index c5b6adff9108..7637bd5c9c8f 100644 --- a/.ci.yaml +++ b/.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,47 +124,7 @@ 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" - - name: Mac_arm64 ios_platform_tests_shard_1 master - plugins - bringup: true # New task; will replace Intel version recipe: plugins/plugins timeout: 60 properties: @@ -195,7 +134,6 @@ targets: 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 properties: @@ -205,7 +143,6 @@ targets: 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 properties: @@ -215,7 +152,6 @@ targets: 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 properties: @@ -225,7 +161,6 @@ targets: 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 properties: @@ -235,52 +170,7 @@ targets: 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 @@ -292,7 +182,6 @@ 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 @@ -304,7 +193,6 @@ 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 @@ -316,7 +204,6 @@ 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 @@ -328,7 +215,6 @@ 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 From 0ee2cb16e244afdc4dd7d72074725c630b19880c Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Wed, 8 Feb 2023 14:10:40 -0500 Subject: [PATCH 2/2] Increase timeouts, with TODO --- .ci.yaml | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/.ci.yaml b/.ci.yaml index 7637bd5c9c8f..14d1e16cd7de 100644 --- a/.ci.yaml +++ b/.ci.yaml @@ -124,9 +124,12 @@ targets: version_file: flutter_stable.version target_file: ios_build_all_plugins.yaml + # 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 recipe: plugins/plugins - timeout: 60 + timeout: 120 properties: add_recipes_cq: "true" version_file: flutter_master.version @@ -135,7 +138,7 @@ targets: - name: Mac_arm64 ios_platform_tests_shard_2 master - plugins recipe: plugins/plugins - timeout: 60 + timeout: 120 properties: add_recipes_cq: "true" version_file: flutter_master.version @@ -144,7 +147,7 @@ targets: - name: Mac_arm64 ios_platform_tests_shard_3 master - plugins recipe: plugins/plugins - timeout: 60 + timeout: 120 properties: add_recipes_cq: "true" version_file: flutter_master.version @@ -153,7 +156,7 @@ targets: - name: Mac_arm64 ios_platform_tests_shard_4 master - plugins recipe: plugins/plugins - timeout: 60 + timeout: 120 properties: add_recipes_cq: "true" version_file: flutter_master.version @@ -162,7 +165,7 @@ targets: - name: Mac_arm64 ios_platform_tests_shard_5 master - plugins recipe: plugins/plugins - timeout: 60 + timeout: 120 properties: add_recipes_cq: "true" version_file: flutter_master.version @@ -173,7 +176,7 @@ targets: - name: Mac_arm64 ios_platform_tests_shard_1 stable - plugins recipe: plugins/plugins presubmit: false - timeout: 60 + timeout: 120 properties: channel: stable add_recipes_cq: "true" @@ -184,7 +187,7 @@ targets: - name: Mac_arm64 ios_platform_tests_shard_2 stable - plugins recipe: plugins/plugins presubmit: false - timeout: 60 + timeout: 120 properties: channel: stable add_recipes_cq: "true" @@ -195,7 +198,7 @@ targets: - name: Mac_arm64 ios_platform_tests_shard_3 stable - plugins recipe: plugins/plugins presubmit: false - timeout: 60 + timeout: 120 properties: channel: stable add_recipes_cq: "true" @@ -206,7 +209,7 @@ targets: - name: Mac_arm64 ios_platform_tests_shard_4 stable - plugins recipe: plugins/plugins presubmit: false - timeout: 60 + timeout: 120 properties: channel: stable add_recipes_cq: "true" @@ -217,7 +220,7 @@ targets: - name: Mac_arm64 ios_platform_tests_shard_5 stable - plugins recipe: plugins/plugins presubmit: false - timeout: 60 + timeout: 120 properties: channel: stable add_recipes_cq: "true"