Skip to content

Commit 1177454

Browse files
authored
chore(evergreen): use macos 15 DEVPROD-18250 (#7531)
* chore(evergreen): use macos 15 * chore(e2e): use gui for all macos unit tests; only run those on main * chore(e2e): revert temporary change to macos intel e2e being patchable
1 parent b70b845 commit 1177454

File tree

2 files changed

+23
-17
lines changed

2 files changed

+23
-17
lines changed

.evergreen/buildvariants-and-tasks.in.yml

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,10 @@ const UNIT_TESTS_BUILD_VARIANTS = [
1818
{
1919
name: 'unit-tests-macos',
2020
display_name: 'Unit Tests MacOS',
21-
run_on: 'macos-14-arm64',
22-
run_on_gui: 'macos-14-arm64-gui'
21+
// We only have gui variants of the macos 15, so both unit tests will be
22+
// running on it. We will not be running those on patches to save resources
23+
run_on: 'macos-15-arm64-gui',
24+
patchable: false,
2325
}
2426
];
2527
@@ -89,15 +91,15 @@ const TEST_PACKAGED_APP_BUILD_VARIANTS = [
8991
depends_on: 'package-macos-x64'
9092
},
9193
{
92-
name: 'test-packaged-app-macos-14-arm',
93-
display_name: 'MacOS arm64 14',
94-
run_on: 'macos-14-arm64-gui',
94+
name: 'test-packaged-app-macos-15-arm',
95+
display_name: 'MacOS arm64 15',
96+
run_on: 'macos-15-arm64-gui',
9597
depends_on: 'package-macos-arm'
9698
},
9799
{
98-
name: 'test-packaged-app-macos-14-x64',
99-
display_name: 'MacOS x64 14',
100-
run_on: 'macos-14-gui',
100+
name: 'test-packaged-app-macos-15-x64',
101+
display_name: 'MacOS x64 15',
102+
run_on: 'macos-15-amd64-gui',
101103
patchable: false,
102104
depends_on: 'package-macos-x64'
103105
}
@@ -150,6 +152,7 @@ buildvariants:
150152

151153
display_name: <%= buildVariant.display_name %>
152154
run_on: <%= buildVariant.run_on %>
155+
patchable: <%= buildVariant.patchable ?? true %>
153156
tasks:
154157
- name: test
155158
- name: test-electron

.evergreen/buildvariants-and-tasks.yml

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,28 +9,31 @@ buildvariants:
99
- name: unit-tests-ubuntu
1010
display_name: Unit Tests Ubuntu
1111
run_on: ubuntu2204-large
12+
patchable: true
1213
tasks:
1314
- name: test
1415
- name: test-electron
1516
- name: unit-tests-windows
1617
display_name: Unit Tests Windows
1718
run_on: windows-vsCurrent-large
19+
patchable: true
1820
tasks:
1921
- name: test
2022
- name: test-electron
2123
- name: unit-tests-rhel
2224
display_name: Unit Tests RHEL
2325
run_on: rhel93-large
26+
patchable: true
2427
tasks:
2528
- name: test
2629
- name: test-electron
2730
- name: unit-tests-macos
2831
display_name: Unit Tests MacOS
29-
run_on: macos-14-arm64
32+
run_on: macos-15-arm64-gui
33+
patchable: false
3034
tasks:
3135
- name: test
3236
- name: test-electron
33-
run_on: macos-14-arm64-gui
3437
- name: package-ubuntu
3538
expansions:
3639
target_platform: ubuntu
@@ -212,9 +215,9 @@ buildvariants:
212215
- name: test-packaged-app-macos-11-1
213216
- name: test-packaged-app-macos-11-2
214217
- name: test-packaged-app-macos-11-3
215-
- name: test-packaged-app-macos-14-arm
216-
display_name: Test Packaged App MacOS arm64 14
217-
run_on: macos-14-arm64-gui
218+
- name: test-packaged-app-macos-15-arm
219+
display_name: Test Packaged App MacOS arm64 15
220+
run_on: macos-15-arm64-gui
218221
patchable: true
219222
depends_on:
220223
- name: package-compass
@@ -223,10 +226,10 @@ buildvariants:
223226
- name: test-packaged-app-1
224227
- name: test-packaged-app-2
225228
- name: test-packaged-app-3
226-
- name: test-packaged-app-macos-14-x64
227-
display_name: Test Packaged App MacOS x64 14
228-
run_on: macos-14-gui
229-
patchable: false
229+
- name: test-packaged-app-macos-15-x64
230+
display_name: Test Packaged App MacOS x64 15
231+
run_on: macos-15-amd64-gui
232+
patchable: true
230233
depends_on:
231234
- name: package-compass
232235
variant: package-macos-x64

0 commit comments

Comments
 (0)