Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Enforce cpu explicitly for Mac devicelab test beds #101871

Merged
merged 2 commits into from
Apr 15, 2022
Merged

Enforce cpu explicitly for Mac devicelab test beds #101871

merged 2 commits into from
Apr 15, 2022

Conversation

keyonghan
Copy link
Contributor

All existing devicelab testbeds are Macmini8,1 now, but from tests config side, we are not enforcing the mac_model.

On the other hand, we are enabling M1 tests and M1 bots in prod, this will cause existing Mac devicelab tests to run against M1 bots. However, not all tests are supported on M1 bots.

This PR tags mac_model: Macmini8,1 explicitly to avoid interaction between test beds. This will also help avoid potential breakage when model changes in the future.

Context: #101861

@jmagman
Copy link
Member

jmagman commented Apr 14, 2022

Is there any way we can tag gpu:Intel instead since that's what we really care about here? We don't want to limit to a model if, say, half our ARM fleet are Mac Minis from last year and the other half are Mac Mini models from this year.

@keyonghan
Copy link
Contributor Author

keyonghan commented Apr 14, 2022 •
edited
Loading

Is there any way we can tag gpu:Intel instead since that's what we really care about here? We don't want to limit to a model if, say, half our ARM fleet are Mac Minis from last year and the other half are Mac Mini models from this year.

Gpu tag for arm Mac is blocked on: https://bugs.chromium.org/p/chromium/issues/detail?id=1109628
Does it make sense we use the mac_model for now and update to gpu when that is supported?

@jmagman
Copy link
Member

jmagman commented Apr 14, 2022

That issue says we can use cpu:arm-64, does that work?

@keyonghan
Copy link
Contributor Author

That issue says we can use cpu:arm-64, does that work?

Arm bots show cpu: arm64, but intel bots show cpu: x86. Is it suffice for intel bots?

@jmagman
Copy link
Member

jmagman commented Apr 14, 2022

That issue says we can use cpu:arm-64, does that work?

Arm bots show cpu: arm64, but intel bots show cpu: x86. Is it suffice for intel bots?

Yes, that's the distinction we need!

@keyonghan keyonghan mentioned this pull request Apr 14, 2022
Merged
@keyonghan
Copy link
Contributor Author

keyonghan commented Apr 14, 2022 •
edited
Loading

flutter/cocoon#1731 and https://flutter-review.googlesource.com/c/infra/+/29061 to support cpu dimension defined in .ci.yaml.

@keyonghan keyonghan changed the title Enforce mac_model explicitly for Mac devicelab test beds Enforce cpu explicitly for Mac devicelab test beds Apr 15, 2022
@keyonghan
Copy link
Contributor Author

Updated all Mac builders to use cpu: x86. This should not affect existing workflows, as of now mac_model: Macmini8,1 is equal to cpu: x86.

But will land this PR after flutter/cocoon#1731 is pushed to latest cocoon version.

jmagman
jmagman approved these changes Apr 15, 2022
View reviewed changes
Copy link
Member

@jmagman jmagman left a comment

Choose a reason for hiding this comment

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

LGTM, thanks @keyonghan!

@fluttergithubbot fluttergithubbot merged commit 7d2d63c into flutter:master Apr 15, 2022
@engine-flutter-autoroll engine-flutter-autoroll mentioned this pull request Apr 15, 2022
Closed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/plugins that referenced this pull request Apr 15, 2022
@engine-flutter-autoroll
7d2d63c Enforce cpu explicitly for Mac devicelab test beds (flutter/f…
e3df41e 
…lutter#101871)
@engine-flutter-autoroll engine-flutter-autoroll mentioned this pull request Apr 15, 2022
Merged
engine-flutter-autoroll added a commit to engine-flutter-autoroll/plugins that referenced this pull request Apr 15, 2022
@engine-flutter-autoroll
7d2d63c Enforce cpu explicitly for Mac devicelab test beds (flutter/f…
f1847ad 
…lutter#101871)
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Apr 21, 2022
@engine-flutter-autoroll
7d2d63c90 Enforce cpu explicitly for Mac devicelab test beds (flutter…
53fe8f2 
…/flutter#101871)
@keyonghan keyonghan deleted the explicit_mac_model branch April 25, 2022 22:02
CaseyHillers pushed a commit to CaseyHillers/flutter that referenced this pull request Apr 27, 2022
@keyonghan
Enforce cpu explicitly for Mac devicelab test beds (flutter#101871)
53ca359
@CaseyHillers CaseyHillers mentioned this pull request Apr 27, 2022
Merged
CaseyHillers pushed a commit that referenced this pull request Apr 28, 2022
@keyonghan
Enforce cpu explicitly for Mac devicelab test beds (#101871) (#102685)
d3d6fba 
Co-authored-by: keyonghan <54558023+keyonghan@users.noreply.github.com>
@jmagman jmagman mentioned this pull request May 5, 2022
Closed
bernard-lee added a commit to bernard-lee/flutter that referenced this pull request Jun 29, 2022
@bernard-lee
Merge branch 'stable' of https://github.com/flutter/flutter into stable
bad536b 
* 'stable' of https://github.com/flutter/flutter: (1203 commits)
  'Update Engine revision to ffe7b86a1e5b5cb63c8385ae1adc759e372ee8f4 for stable release 3.0.3' (flutter#106431)
  [flutter_releases] Removing minor iOS version filter value from ci.yaml (flutter#105059) (flutter#105629)
  [flutter_releases] Flutter stable 3.0.2 Framework Cherrypicks (flutter#105528)
  [framework] ensure ink sparkle is disposed (flutter#104569) (flutter#105144)
  [CP] Fix Flutter doctor crash on Windows caused by bad UTF8 from vswhere.exe (flutter#105153)
  [tool][web] Use 'constructor' instead of 'public field declarations' in flutter.js (Safari 13) (flutter#105162)
  [flutter_releases] Cherrypicks for SliverReorderableList and Slider regressions (flutter#105141)
  'Update Engine revision to caaafc5604ee9172293eb84a381be6aadd660317 for stable release 3.0.1' (flutter#104213)
  [flutter_releases] Flutter stable 2.13.0 Framework Cherrypicks (flutter#103375)
  [flutter_releases] Flutter beta 2.13.0-0.4.pre Framework Cherrypicks (flutter#103101)
  Enforce cpu explicitly for Mac devicelab test beds (flutter#101871) (flutter#102685)
  [flutter_releases] Flutter beta 2.13.0-0.3.pre Framework Cherrypicks (flutter#102620)
  [flutter_releases] Upgrade dwds to 12.1.1 (flutter#101546)
  [flutter_releases] Flutter beta 2.13.0-0.2.pre Framework Cherrypicks (flutter#102193)
  [flutter_releases] Flutter beta 2.12.0-4.1.pre Framework Cherrypicks (flutter#101771)
  [flutter_releases] Cherrypick engine to c341645 (flutter#101608)
  Revert "Refactor `ToggleButtons` (remove `RawMaterialButton`) (flutter#99493)" (flutter#101538)
  [Cherrypick] Partial revert of super params in tools (flutter#101436) (flutter#101527)
  Roll Engine from e7e7ca1 to b48d65e (10 revisions) (flutter#101370)
  [flutter_tools] port bash script to use sysctl not uname on macOS (flutter#101308)
  ...
pieter-scholtz added a commit to pieter-scholtz/flutter that referenced this pull request Jul 7, 2022
@pieter-scholtz
Revert "Enforce cpu explicitly for Mac devicelab test beds (flutter#1…
f572f9d 
…01871) (flutter#102685)"

This reverts commit d3d6fba.
@keyonghan keyonghan mentioned this pull request Aug 23, 2022
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jmagman jmagman jmagman approved these changes

@godofredoc godofredoc Awaiting requested review from godofredoc

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@keyonghan @jmagman @fluttergithubbot