Skip to content
Merged
Changes from 1 commit
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
Prev Previous commit
Next Next commit
Revert presubmit test changes, update new packages
  • Loading branch information
stuartmorgan-g committed Jul 5, 2023
commit 4f072bb8b78acb2b486f7134c9f76de92563fade
43 changes: 20 additions & 23 deletions .ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -93,40 +93,26 @@ targets:
version_file: flutter_master.version

- name: Linux dart_unit_test_shard_1 master
# DO NOT LAND - for presubmit validation only.
#bringup: true # New target
bringup: true # New target
recipe: packages/packages
timeout: 60
properties:
# DO NOT LAND - for presubmit validation only.
target_file: linux_custom_package_tests.yaml
target_file: dart_unit_tests.yaml
channel: master
version_file: flutter_master.version
cores: "32"
package_sharding: "--shardIndex 0 --shardCount 2"

- name: Linux dart_unit_test_shard_2 master
# DO NOT LAND - for presubmit validation only.
#bringup: true # New target
bringup: true # New target
recipe: packages/packages
timeout: 60
properties:
# DO NOT LAND - for presubmit validation only.
target_file: linux_custom_package_tests.yaml
target_file: dart_unit_tests.yaml
channel: master
version_file: flutter_master.version
cores: "32"
package_sharding: "--shardIndex 1 --shardCount 2"
# DO NOT LAND - for adding to the real target.
# Android deps for tests that build Android.
# clang for tests that run the formatter.
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:33v6"},
{"dependency": "open_jdk", "version": "version:11"},
{"dependency": "curl", "version": "version:7.64.0"},
{"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"}
]

- name: Linux dart_unit_test_shard_1 stable
bringup: true # New target
Expand Down Expand Up @@ -228,29 +214,40 @@ targets:
channel: stable
version_file: flutter_stable.version

- name: Linux custom_package_tests master
- name: Linux_android custom_package_tests master
Copy link
Member

Choose a reason for hiding this comment

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

Does the name of these need to start with Linux_android? Why not just Linux custom_package_tests master?

Copy link
Collaborator Author

@stuartmorgan-g stuartmorgan-g Jul 6, 2023

Choose a reason for hiding this comment

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

That would use the more generic Linux configuration, and then I would have to duplicate all the dependencies in each of the targets. I considered it, but opted for less repetition over preferred naming.

The rigidity of LUCI .ci.yaml naming and how it determines behavior is definitely not one of my favorite parts of LUCI. I would much rather the base config be a property unrelated to name.

bringup: true # New target
recipe: packages/packages
timeout: 60
timeout: 30
properties:
add_recipes_cq: "true"
version_file: flutter_master.version
target_file: linux_custom_package_tests.yaml
cores: "32"
# Pigeon tests need Andoid deps (thus the Linux_android base) and
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
# Pigeon tests need Andoid deps (thus the Linux_android base) and
# Pigeon tests need Android deps (thus the Linux_android base) and

Is this sufficient to name the suite "Linux_android" though? :P

Copy link
Contributor

Choose a reason for hiding this comment

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

I like andoid better

Copy link
Member

Choose a reason for hiding this comment

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

Linux_andoid custom_package_tests master :P

# clang-format.
dependencies: >-
[
{"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"}
]
channel: master

- name: Linux custom_package_tests stable
- name: Linux_android custom_package_tests stable
bringup: true # New target
recipe: packages/packages
timeout: 60
timeout: 30
properties:
add_recipes_cq: "true"
version_file: flutter_stable.version
target_file: linux_custom_package_tests.yaml
cores: "32"
# Pigeon tests need Andoid deps (thus the Linux_android base) and
# clang-format.
dependencies: >-
[
{"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"}
]
channel: stable


### Android tasks ###
- name: Linux_android android_build_all_packages master
recipe: packages/packages
Expand Down