Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Use release_build and os dimension consistently. #42012

Merged
merged 5 commits into from
May 15, 2023
Merged

Use release_build and os dimension consistently. #42012

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
54f4323
Use release_build and os dimension consistently.
godofredoc May 13, 2023
f70ef37
Move to drone_dimensions.
godofredoc May 15, 2023
0c704e1
Move to drone dimensions.
godofredoc May 15, 2023
49a94c5
Move drone_dimensions to properties.
godofredoc May 15, 2023
063cbe6
Add version to os dimension.
godofredoc May 15, 2023
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
30 changes: 27 additions & 3 deletions .ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,41 +259,53 @@ targets:
bringup: true
recipe: engine_v2/engine_v2
timeout: 60
dimensions:
Copy link
Contributor

Choose a reason for hiding this comment

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

Shall this be drone_dimensions?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Updated

os: "Linux"
properties:
release_build: "true"
config_name: linux_fuchsia

- name: Linux linux_arm_host_engine
recipe: engine_v2/engine_v2
timeout: 60
dimensions:
os: "Linux"
Copy link
Contributor

Choose a reason for hiding this comment

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

We also use ubuntu, can we make them consistent?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

No, this property is being used to detect the drone names, if we use ubuntu it will translate to Ubuntu Production Drone

Copy link
Contributor

Choose a reason for hiding this comment

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

Done_dimensions are not determining the Platform of the drone builder. It is the platform of the orchestrator builder instead.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Please take a look to: https://cs.opensource.google/flutter/recipes/+/main:recipe_modules/shard_util_v2/api.py;l=271

Copy link
Contributor

Choose a reason for hiding this comment

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

My bad based on a local checkout which is not up to date.

Linux should be fine then. Could we keep the Mac ones with the version to enforce same config? We do have consistent all Mac-12 in our fleet as of now, but just in case we have different versions. This makes it consistent with all other os dimension.

properties:
release_build: "true"
config_name: linux_arm_host_engine

- name: Linux linux_host_engine
recipe: engine_v2/engine_v2
timeout: 60
dimensions:
os: "Linux"
properties:
release_build: "true"
config_name: linux_host_engine

- name: Linux linux_host_desktop_engine
recipe: engine_v2/engine_v2
timeout: 60
dimensions:
os: "Linux"
properties:
release_build: "true"
config_name: linux_host_desktop_engine

- name: Linux linux_android_aot_engine
recipe: engine_v2/engine_v2
timeout: 60
dimensions:
os: "Linux"
properties:
release_build: "true"
config_name: linux_android_aot_engine

- name: Linux linux_android_debug_engine
recipe: engine_v2/engine_v2
timeout: 60
dimensions:
os: "Linux"
properties:
release_build: "true"
config_name: linux_android_debug_engine
Expand All @@ -302,13 +314,14 @@ targets:
recipe: engine_v2/builder
timeout: 60
properties:
release_build: "true"
config_name: linux_license
clobber: "true"

- name: Linux linux_web_engine
recipe: engine_v2/engine_v2
timeout: 70
dimensions:
os: "Linux"
properties:
release_build: "true"
config_name: linux_web_engine
Expand All @@ -317,7 +330,6 @@ targets:
recipe: engine_v2/engine_v2
timeout: 60
properties:
release_build: "true"
config_name: linux_unopt

- name: Linux Web Framework tests
Expand Down Expand Up @@ -374,7 +386,10 @@ targets:
- name: Linux mac_android_aot_engine
recipe: engine_v2/engine_v2
timeout: 60
dimensions:
os: "Linux"
properties:
release_build: "true"
config_name: mac_android_aot_engine

- name: Mac mac_clang_tidy
Expand All @@ -399,6 +414,8 @@ targets:
- name: Mac mac_host_engine
recipe: engine_v2/engine_v2
timeout: 60
dimensions:
os: "Mac"
properties:
release_build: "true"
cpu: arm64
Expand Down Expand Up @@ -485,6 +502,8 @@ targets:
- name: Mac mac_ios_engine
recipe: engine_v2/engine_v2
timeout: 60
dimensions:
os: "Mac"
properties:
release_build: "true"
config_name: mac_ios_engine
Expand All @@ -500,7 +519,6 @@ targets:
recipe: engine_v2/engine_v2
timeout: 60
properties:
release_build: "true"
Copy link
Contributor

Choose a reason for hiding this comment

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

From the PR description:

Release_build property is used to signal that this build produces release artifacts that will eventually be SLSA compliant and will need to run from dart_internal.

I didn't quite follow why we need to remove here. Do we not want to run them against dart_internal any more?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Only builders generating artifacts will be running in dart-internal. Builders like "Mac impeller-cmake-example" are test only and should not run in dart-internal.

cpu: arm64
config_name: mac_impeller_cmake_example

Expand All @@ -526,20 +544,26 @@ targets:
- name: Windows windows_android_aot_engine
recipe: engine_v2/engine_v2
timeout: 60
dimensions:
os: "Windows"
properties:
release_build: "true"
config_name: windows_android_aot_engine

- name: Windows windows_host_engine
recipe: engine_v2/engine_v2
timeout: 60
dimensions:
os: "Windows"
properties:
release_build: "true"
config_name: windows_host_engine

- name: Windows windows_arm_host_engine
recipe: engine_v2/engine_v2
timeout: 60
dimensions:
os: "Windows"
enabled_branches:
# Don't run this on release branches
- main
Expand Down