Skip to content

chore(evergreen): use macos 15 DEVPROD-18250 #7531

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

Merged
merged 3 commits into from
Nov 18, 2025
Merged

chore(evergreen): use macos 15 DEVPROD-18250 #7531

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8b70bdd
chore(evergreen): use macos 15
gribnoysup Nov 3, 2025
f151c8d
chore(e2e): use gui for all macos unit tests; only run those on main
gribnoysup Nov 6, 2025
9c375f2
chore(e2e): revert temporary change to macos intel e2e being patchable
gribnoysup Nov 6, 2025
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
18 changes: 9 additions & 9 deletions .evergreen/buildvariants-and-tasks.in.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ const UNIT_TESTS_BUILD_VARIANTS = [
{
name: 'unit-tests-macos',
display_name: 'Unit Tests MacOS',
run_on: 'macos-14-arm64',
run_on_gui: 'macos-14-arm64-gui'
run_on: 'macos-15-arm64',
run_on_gui: 'macos-15-arm64-gui'
}
];

Expand Down Expand Up @@ -89,16 +89,16 @@ const TEST_PACKAGED_APP_BUILD_VARIANTS = [
depends_on: 'package-macos-x64'
},
{
name: 'test-packaged-app-macos-14-arm',
display_name: 'MacOS arm64 14',
run_on: 'macos-14-arm64-gui',
name: 'test-packaged-app-macos-15-arm',
display_name: 'MacOS arm64 15',
run_on: 'macos-15-arm64-gui',
depends_on: 'package-macos-arm'
},
{
name: 'test-packaged-app-macos-14-x64',
display_name: 'MacOS x64 14',
run_on: 'macos-14-gui',
patchable: false,
name: 'test-packaged-app-macos-15-x64',
display_name: 'MacOS x64 15',
run_on: 'macos-15-amd64-gui',
patchable: true, // TODO: just to test that this works, revert before merging
depends_on: 'package-macos-x64'
}
];
Expand Down
18 changes: 9 additions & 9 deletions .evergreen/buildvariants-and-tasks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ buildvariants:
- name: test-electron
- name: unit-tests-macos
display_name: Unit Tests MacOS
run_on: macos-14-arm64
run_on: macos-15-arm64
Copy link
Collaborator Author

@gribnoysup gribnoysup Nov 3, 2025

Choose a reason for hiding this comment

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

Specifically this will probably not work: just noticed that while we got gui hosts, we didn't really get non-gui ones and so there's only one there and its quarantined 🤔

Copy link

@leafnunes leafnunes Nov 3, 2025

Choose a reason for hiding this comment

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

I'm wondering if we can get away with a single fleet (with desktop and docker present); would you mind using "macos-15-arm64-gui"?

Copy link
Collaborator Author

@gribnoysup gribnoysup Nov 4, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

Theoretically it's totally possible! Our usual concern here is that there's not a lot of these gui hosts, so we're trying to only use them for tasks where gui session is a requirement. I do think though that we might want to reshuffle things a bit here anyway and work around that by:

  1. Only running units for macos on main, not on PRs. Then overuse of those hosts is less of a concern
  2. For non-gui variant here, maybe keep them running on macos-14 if provisioning macos-15 is a hassle. For unit tests I don't think we really need to be that strict here on what we're testing

Also just want to mention that e2e tests seem to be running just fine, so from that perspective new machines definitely work as expected for us!

Copy link
Collaborator

@addaleax addaleax Nov 4, 2025

Choose a reason for hiding this comment

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

@leafnunes Is your suggestion that devprod will merge the fleets and provide a single distro id for all those macOS hosts, so the total # of hosts available will be fairly large?

That actually sounds like a decent idea, I think we just assumed that it would be additional work for DevProd to provision and maintain extra GUI hosts

Copy link

@leafnunes leafnunes Nov 4, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

@addaleax Yes; while it does require a manual step to enable, once a base image is made it's possible to build from it and deploy them in an automated fashion. Until we don't need guis at all, we might as well consolidate so every mac host provides the same services.
We can revisit this decision if breaking them out makes better sense from a scheduling perspective (i.e. if gui tests that run for a long time end up blocking shorter tasks for longer than necessary)

Copy link
Collaborator Author

@gribnoysup gribnoysup Nov 6, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

Not opposed to that idea at all, but yeah, would be nice to get a few more of these macos-15-gui hosts. I think for now we might be okay with switching all variants of macos unit tests to these gui hosts and only running them on main, not on patches. If we notice that this starts to slow us down, we can reconsider

Copy link
Collaborator Author

@gribnoysup gribnoysup Nov 6, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

Pushed the change to switch all macos units to gui and disable them on patches. Tried them manually in this patch

tasks:
- name: test
- name: test-electron
run_on: macos-14-arm64-gui
run_on: macos-15-arm64-gui
- name: package-ubuntu
expansions:
target_platform: ubuntu
Expand Down Expand Up @@ -212,9 +212,9 @@ buildvariants:
- name: test-packaged-app-macos-11-1
- name: test-packaged-app-macos-11-2
- name: test-packaged-app-macos-11-3
- name: test-packaged-app-macos-14-arm
display_name: Test Packaged App MacOS arm64 14
run_on: macos-14-arm64-gui
- name: test-packaged-app-macos-15-arm
display_name: Test Packaged App MacOS arm64 15
run_on: macos-15-arm64-gui
patchable: true
depends_on:
- name: package-compass
Expand All @@ -223,10 +223,10 @@ buildvariants:
- name: test-packaged-app-1
- name: test-packaged-app-2
- name: test-packaged-app-3
- name: test-packaged-app-macos-14-x64
display_name: Test Packaged App MacOS x64 14
run_on: macos-14-gui
patchable: false
- name: test-packaged-app-macos-15-x64
display_name: Test Packaged App MacOS x64 15
run_on: macos-15-amd64-gui
patchable: true
depends_on:
- name: package-compass
variant: package-macos-x64
Expand Down