[go: nahoru, domu]

Skip to content
This repository has been archived by the owner on Feb 22, 2023. It is now read-only.

[ci] Part 1 of swapping iOS platform test arch #7064

Merged
merged 4 commits into from
Jan 31, 2023
Merged
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
118 changes: 118 additions & 0 deletions .ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -168,6 +188,56 @@ targets:
target_file: ios_platform_tests.yaml
package_sharding: "--shardIndex 3 --shardCount 4"

- name: Mac_arm64 ios_platform_tests_1_of_5 master
Copy link
Member
@jmagman jmagman Jan 31, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Now that you've felt the pain of bringup, you may be better off leaving off the number of shards so adding a shard doesn't require a rename of all of them, like:

Suggested change
- name: Mac_arm64 ios_platform_tests_1_of_5 master
- name: Mac_arm64 ios_platform_tests_1 master

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good point. Keyong and I talked about the naming, but I don't think we talked about that specifically; I think including the number of shards was just a translation from the Cirrus behavior of the matrix variables being in the display name.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Renamed from x_of_N to shard_x. I also added - plugins while I'm renaming everything so the flutter/packages version can have no suffix to reduce work after the merge (currently they all have - packages to avoid name collisions in the central LUCI system).

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 5"

- name: Mac_arm64 ios_platform_tests_2_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 1 --shardCount 5"

- name: Mac_arm64 ios_platform_tests_3_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 2 --shardCount 5"

- name: Mac_arm64 ios_platform_tests_4_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 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
recipe: plugins/plugins
Expand Down Expand Up @@ -213,6 +283,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
Expand Down