Skip to content

Commit 53e5363

Browse files
authored
fix: use mongodb version 8.0.5 on macOS versions < 14 (#6821)
Use mongodb version 8.0.5 on macOS versions < 14
1 parent 6c1fe2e commit 53e5363

File tree

3 files changed

+115
-6
lines changed

3 files changed

+115
-6
lines changed

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

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -248,8 +248,12 @@ buildvariants:
248248
variant: <%= buildVariant.depends_on %>
249249
tasks:
250250
<% for (const group of E2E_TEST_GROUPS) { %>
251+
<% if (['test-packaged-app-macos-11-arm', 'test-packaged-app-macos-11-x64'].includes(buildVariant.name)) { %>
252+
- name: test-packaged-app-macos13-<%= group.number %>
253+
<% } else { %>
251254
- name: test-packaged-app-<%= group.number %>
252255
<% } %>
256+
<% } %>
253257
<% } %>
254258

255259
- name: publish
@@ -501,6 +505,32 @@ tasks:
501505
e2e_test_groups: <%= E2E_TEST_GROUPS.length %>
502506
e2e_test_group: <%= group.number %>
503507
debug: 'compass-e2e-tests*,electron*,hadron*,mongo*'
508+
509+
- name: test-packaged-app-macos13-<%= group.number %>
510+
tags:
511+
- required-for-publish
512+
- run-on-pr
513+
- assigned_to_jira_team_compass_compass
514+
- foliage_check_task_only
515+
commands:
516+
- func: prepare
517+
- func: install
518+
- func: bootstrap
519+
vars:
520+
scope: 'compass-e2e-tests'
521+
- func: apply-compass-target-expansion
522+
vars:
523+
compass_distribution: compass
524+
- func: get-packaged-app
525+
vars:
526+
compass_distribution: compass
527+
- func: test-packaged-app
528+
vars:
529+
mongodb_version: 8.0.5
530+
compass_distribution: compass
531+
e2e_test_groups: <%= E2E_TEST_GROUPS.length %>
532+
e2e_test_group: <%= group.number %>
533+
debug: 'compass-e2e-tests*,electron*,hadron*,mongo*'
504534
<% } %>
505535

506536
<% for (const browser of BROWSERS) { %>

.evergreen/buildvariants-and-tasks.yml

Lines changed: 81 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -222,9 +222,9 @@ buildvariants:
222222
- name: package-compass
223223
variant: package-macos-arm
224224
tasks:
225-
- name: test-packaged-app-1
226-
- name: test-packaged-app-2
227-
- name: test-packaged-app-3
225+
- name: test-packaged-app-macos13-1
226+
- name: test-packaged-app-macos13-2
227+
- name: test-packaged-app-macos13-3
228228
- name: test-packaged-app-macos-11-x64
229229
display_name: Test Packaged App MacOS x64 11
230230
run_on: macos-11-gui
@@ -233,9 +233,9 @@ buildvariants:
233233
- name: package-compass
234234
variant: package-macos-x64
235235
tasks:
236-
- name: test-packaged-app-1
237-
- name: test-packaged-app-2
238-
- name: test-packaged-app-3
236+
- name: test-packaged-app-macos13-1
237+
- name: test-packaged-app-macos13-2
238+
- name: test-packaged-app-macos13-3
239239
- name: test-packaged-app-macos-14-arm
240240
display_name: Test Packaged App MacOS arm64 14
241241
run_on: macos-14-arm64-gui
@@ -1577,6 +1577,31 @@ tasks:
15771577
e2e_test_groups: 3
15781578
e2e_test_group: 1
15791579
debug: compass-e2e-tests*,electron*,hadron*,mongo*
1580+
- name: test-packaged-app-macos13-1
1581+
tags:
1582+
- required-for-publish
1583+
- run-on-pr
1584+
- assigned_to_jira_team_compass_compass
1585+
- foliage_check_task_only
1586+
commands:
1587+
- func: prepare
1588+
- func: install
1589+
- func: bootstrap
1590+
vars:
1591+
scope: compass-e2e-tests
1592+
- func: apply-compass-target-expansion
1593+
vars:
1594+
compass_distribution: compass
1595+
- func: get-packaged-app
1596+
vars:
1597+
compass_distribution: compass
1598+
- func: test-packaged-app
1599+
vars:
1600+
mongodb_version: 8.0.5
1601+
compass_distribution: compass
1602+
e2e_test_groups: 3
1603+
e2e_test_group: 1
1604+
debug: compass-e2e-tests*,electron*,hadron*,mongo*
15801605
- name: test-packaged-app-2
15811606
tags:
15821607
- required-for-publish
@@ -1602,6 +1627,31 @@ tasks:
16021627
e2e_test_groups: 3
16031628
e2e_test_group: 2
16041629
debug: compass-e2e-tests*,electron*,hadron*,mongo*
1630+
- name: test-packaged-app-macos13-2
1631+
tags:
1632+
- required-for-publish
1633+
- run-on-pr
1634+
- assigned_to_jira_team_compass_compass
1635+
- foliage_check_task_only
1636+
commands:
1637+
- func: prepare
1638+
- func: install
1639+
- func: bootstrap
1640+
vars:
1641+
scope: compass-e2e-tests
1642+
- func: apply-compass-target-expansion
1643+
vars:
1644+
compass_distribution: compass
1645+
- func: get-packaged-app
1646+
vars:
1647+
compass_distribution: compass
1648+
- func: test-packaged-app
1649+
vars:
1650+
mongodb_version: 8.0.5
1651+
compass_distribution: compass
1652+
e2e_test_groups: 3
1653+
e2e_test_group: 2
1654+
debug: compass-e2e-tests*,electron*,hadron*,mongo*
16051655
- name: test-packaged-app-3
16061656
tags:
16071657
- required-for-publish
@@ -1627,6 +1677,31 @@ tasks:
16271677
e2e_test_groups: 3
16281678
e2e_test_group: 3
16291679
debug: compass-e2e-tests*,electron*,hadron*,mongo*
1680+
- name: test-packaged-app-macos13-3
1681+
tags:
1682+
- required-for-publish
1683+
- run-on-pr
1684+
- assigned_to_jira_team_compass_compass
1685+
- foliage_check_task_only
1686+
commands:
1687+
- func: prepare
1688+
- func: install
1689+
- func: bootstrap
1690+
vars:
1691+
scope: compass-e2e-tests
1692+
- func: apply-compass-target-expansion
1693+
vars:
1694+
compass_distribution: compass
1695+
- func: get-packaged-app
1696+
vars:
1697+
compass_distribution: compass
1698+
- func: test-packaged-app
1699+
vars:
1700+
mongodb_version: 8.0.5
1701+
compass_distribution: compass
1702+
e2e_test_groups: 3
1703+
e2e_test_group: 3
1704+
debug: compass-e2e-tests*,electron*,hadron*,mongo*
16301705
- name: test-web-sandbox-chrome-1
16311706
tags:
16321707
- required-for-publish

.github/workflows/test-installers.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -229,6 +229,10 @@ jobs:
229229
DISTRO_ID: ${{ matrix.distro-id }}
230230
# Exposing token to prevent update server from being rate limited
231231
GITHUB_TOKEN: ${{ github.token }}
232+
# mongodb 8.0.6 requires macOS 14+. Just use an older version for now
233+
# so it will run on GitHub's mac runners
234+
MONGODB_VERSION: "8.0.5"
235+
MONGODB_RUNNER_VERSION: "8.0.5"
232236
working-directory: packages/compass-smoke-tests
233237
# Using --skipUninstalling --skipCleanup because the runners are ephemeral
234238
run: npm start -- --package ${{ matrix.package }} --tests ${{ matrix.test }} --skipUninstall --skipCleanup

0 commit comments

Comments
 (0)