From 5251954e2195a844467c8424e2a9cf68c417da5a Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Mon, 30 Jan 2023 16:03:52 -0500 Subject: [PATCH 1/4] [ci] Part 1 of swapping iOS task arch Adds Intel versions of iOS build-all and ARM versions of iOS platform tests, as part one of swapping them. Once the new tasks propagate, they will be brought out of bringup mode and the old versions removed. These were on the opposite architectures because of issues with running the platfor tests on Cirrus ARM VMs, and then were ported as-is from Cirrus to LUCI, but now that macOS ARM works on LUCI we can switch to the desired configuration. --- .ci.yaml | 108 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 108 insertions(+) diff --git a/.ci.yaml b/.ci.yaml index b99ed5460056..585f0efca6e2 100644 --- a/.ci.yaml +++ b/.ci.yaml @@ -129,6 +129,26 @@ targets: version_file: flutter_stable.version target_file: ios_build_all_plugins.yaml + - name: Mac_x64 ios_build_all_plugins master + bringup: true # New task, replaces ARM version + 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_x64 ios_build_all_plugins stable + bringup: true # New task, replaces ARM version + recipe: plugins/plugins + timeout: 30 + properties: + channel: stable + add_recipes_cq: "true" + 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 @@ -168,6 +188,46 @@ targets: target_file: ios_platform_tests.yaml package_sharding: "--shardIndex 3 --shardCount 4" + - name: Mac_arm64 ios_platform_tests_1_of_4 master + bringup: true # New task; will replace Intel version + 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_arm64 ios_platform_tests_2_of_4 master + bringup: true # New task; will replace Intel version + 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_arm64 ios_platform_tests_3_of_4 master + bringup: true # New task; will replace Intel version + 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_arm64 ios_platform_tests_4_of_4 master + bringup: true # New task; will replace Intel version + 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" + # 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 @@ -213,6 +273,54 @@ targets: target_file: ios_platform_tests.yaml package_sharding: "--shardIndex 3 --shardCount 4" + - name: Mac_arm64 ios_platform_tests_1_of_4 stable + bringup: true # New task; will replace Intel version + 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_arm64 ios_platform_tests_2_of_4 stable + bringup: true # New task; will replace Intel version + 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_arm64 ios_platform_tests_3_of_4 stable + bringup: true # New task; will replace Intel version + 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_arm64 ios_platform_tests_4_of_4 stable + bringup: true # New task; will replace Intel version + 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: Windows win32-platform_tests master recipe: plugins/plugins timeout: 60 From 1e13abe9cb14e363642917ed1faa98ee30335281 Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Mon, 30 Jan 2023 19:15:05 -0500 Subject: [PATCH 2/4] Increase sharding --- .ci.yaml | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/.ci.yaml b/.ci.yaml index 585f0efca6e2..5ad3e897ab77 100644 --- a/.ci.yaml +++ b/.ci.yaml @@ -188,7 +188,7 @@ targets: target_file: ios_platform_tests.yaml package_sharding: "--shardIndex 3 --shardCount 4" - - name: Mac_arm64 ios_platform_tests_1_of_4 master + - name: Mac_arm64 ios_platform_tests_1_of_5 master bringup: true # New task; will replace Intel version recipe: plugins/plugins timeout: 60 @@ -196,9 +196,9 @@ targets: add_recipes_cq: "true" version_file: flutter_master.version target_file: ios_platform_tests.yaml - package_sharding: "--shardIndex 0 --shardCount 4" + package_sharding: "--shardIndex 0 --shardCount 5" - - name: Mac_arm64 ios_platform_tests_2_of_4 master + - name: Mac_arm64 ios_platform_tests_2_of_5 master bringup: true # New task; will replace Intel version recipe: plugins/plugins timeout: 60 @@ -206,9 +206,9 @@ targets: add_recipes_cq: "true" version_file: flutter_master.version target_file: ios_platform_tests.yaml - package_sharding: "--shardIndex 1 --shardCount 4" + package_sharding: "--shardIndex 1 --shardCount 5" - - name: Mac_arm64 ios_platform_tests_3_of_4 master + - name: Mac_arm64 ios_platform_tests_3_of_5 master bringup: true # New task; will replace Intel version recipe: plugins/plugins timeout: 60 @@ -216,9 +216,9 @@ targets: add_recipes_cq: "true" version_file: flutter_master.version target_file: ios_platform_tests.yaml - package_sharding: "--shardIndex 2 --shardCount 4" + package_sharding: "--shardIndex 2 --shardCount 5" - - name: Mac_arm64 ios_platform_tests_4_of_4 master + - name: Mac_arm64 ios_platform_tests_4_of_5 master bringup: true # New task; will replace Intel version recipe: plugins/plugins timeout: 60 @@ -226,7 +226,17 @@ targets: add_recipes_cq: "true" version_file: flutter_master.version target_file: ios_platform_tests.yaml - package_sharding: "--shardIndex 3 --shardCount 4" + package_sharding: "--shardIndex 3 --shardCount 5" + + - name: Mac_arm64 ios_platform_tests_5_of_5 master + bringup: true # New task; will replace Intel version + recipe: plugins/plugins + timeout: 60 + 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 From 084801756e45129e78b59713fa08bf84b860f24f Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Mon, 30 Jan 2023 19:22:56 -0500 Subject: [PATCH 3/4] Renaming --- .ci.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.ci.yaml b/.ci.yaml index 5ad3e897ab77..e4192af54b77 100644 --- a/.ci.yaml +++ b/.ci.yaml @@ -188,7 +188,7 @@ targets: target_file: ios_platform_tests.yaml package_sharding: "--shardIndex 3 --shardCount 4" - - name: Mac_arm64 ios_platform_tests_1_of_5 master + - name: Mac_arm64 ios_platform_tests_shard_1 master - plugins bringup: true # New task; will replace Intel version recipe: plugins/plugins timeout: 60 @@ -198,7 +198,7 @@ targets: target_file: ios_platform_tests.yaml package_sharding: "--shardIndex 0 --shardCount 5" - - name: Mac_arm64 ios_platform_tests_2_of_5 master + - name: Mac_arm64 ios_platform_tests_shard_2 master - plugins bringup: true # New task; will replace Intel version recipe: plugins/plugins timeout: 60 @@ -208,7 +208,7 @@ targets: target_file: ios_platform_tests.yaml package_sharding: "--shardIndex 1 --shardCount 5" - - name: Mac_arm64 ios_platform_tests_3_of_5 master + - name: Mac_arm64 ios_platform_tests_shard_3 master - plugins bringup: true # New task; will replace Intel version recipe: plugins/plugins timeout: 60 @@ -218,7 +218,7 @@ targets: target_file: ios_platform_tests.yaml package_sharding: "--shardIndex 2 --shardCount 5" - - name: Mac_arm64 ios_platform_tests_4_of_5 master + - name: Mac_arm64 ios_platform_tests_shard_4 master - plugins bringup: true # New task; will replace Intel version recipe: plugins/plugins timeout: 60 @@ -228,7 +228,7 @@ targets: target_file: ios_platform_tests.yaml package_sharding: "--shardIndex 3 --shardCount 5" - - name: Mac_arm64 ios_platform_tests_5_of_5 master + - name: Mac_arm64 ios_platform_tests_shard_5 master - plugins bringup: true # New task; will replace Intel version recipe: plugins/plugins timeout: 60 From dff51421dc880cd9d5944112e202f287a7ab9be0 Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Mon, 30 Jan 2023 19:26:41 -0500 Subject: [PATCH 4/4] Also do stable --- .ci.yaml | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/.ci.yaml b/.ci.yaml index e4192af54b77..67378c413b86 100644 --- a/.ci.yaml +++ b/.ci.yaml @@ -283,7 +283,7 @@ targets: target_file: ios_platform_tests.yaml package_sharding: "--shardIndex 3 --shardCount 4" - - name: Mac_arm64 ios_platform_tests_1_of_4 stable + - name: Mac_arm64 ios_platform_tests_shard_1 stable - plugins bringup: true # New task; will replace Intel version recipe: plugins/plugins presubmit: false @@ -293,9 +293,9 @@ targets: add_recipes_cq: "true" version_file: flutter_stable.version target_file: ios_platform_tests.yaml - package_sharding: "--shardIndex 0 --shardCount 4" + package_sharding: "--shardIndex 0 --shardCount 5" - - name: Mac_arm64 ios_platform_tests_2_of_4 stable + - name: Mac_arm64 ios_platform_tests_shard_2 stable - plugins bringup: true # New task; will replace Intel version recipe: plugins/plugins presubmit: false @@ -305,9 +305,9 @@ targets: add_recipes_cq: "true" version_file: flutter_stable.version target_file: ios_platform_tests.yaml - package_sharding: "--shardIndex 1 --shardCount 4" + package_sharding: "--shardIndex 1 --shardCount 5" - - name: Mac_arm64 ios_platform_tests_3_of_4 stable + - name: Mac_arm64 ios_platform_tests_shard_3 stable - plugins bringup: true # New task; will replace Intel version recipe: plugins/plugins presubmit: false @@ -317,9 +317,9 @@ targets: add_recipes_cq: "true" version_file: flutter_stable.version target_file: ios_platform_tests.yaml - package_sharding: "--shardIndex 2 --shardCount 4" + package_sharding: "--shardIndex 2 --shardCount 5" - - name: Mac_arm64 ios_platform_tests_4_of_4 stable + - name: Mac_arm64 ios_platform_tests_shard_4 stable - plugins bringup: true # New task; will replace Intel version recipe: plugins/plugins presubmit: false @@ -329,7 +329,19 @@ targets: add_recipes_cq: "true" version_file: flutter_stable.version target_file: ios_platform_tests.yaml - package_sharding: "--shardIndex 3 --shardCount 4" + 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 + properties: + channel: stable + add_recipes_cq: "true" + version_file: flutter_stable.version + target_file: ios_platform_tests.yaml + package_sharding: "--shardIndex 4 --shardCount 5" - name: Windows win32-platform_tests master recipe: plugins/plugins