Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 30 additions & 0 deletions .evergreen/buildvariants-and-tasks.in.yml
Original file line number Diff line number Diff line change
Expand Up @@ -248,8 +248,12 @@ buildvariants:
variant: <%= buildVariant.depends_on %>
tasks:
<% for (const group of E2E_TEST_GROUPS) { %>
<% if (['test-packaged-app-macos-11-arm', 'test-packaged-app-macos-11-x64'].includes(buildVariant.name)) { %>
- name: test-packaged-app-macos13-<%= group.number %>
<% } else { %>
- name: test-packaged-app-<%= group.number %>
<% } %>
<% } %>
<% } %>

- name: publish
Expand Down Expand Up @@ -501,6 +505,32 @@ tasks:
e2e_test_groups: <%= E2E_TEST_GROUPS.length %>
e2e_test_group: <%= group.number %>
debug: 'compass-e2e-tests*,electron*,hadron*,mongo*'

- name: test-packaged-app-macos13-<%= group.number %>
tags:
- required-for-publish
- run-on-pr
- assigned_to_jira_team_compass_compass
- foliage_check_task_only
commands:
- func: prepare
- func: install
- func: bootstrap
vars:
scope: 'compass-e2e-tests'
- func: apply-compass-target-expansion
vars:
compass_distribution: compass
- func: get-packaged-app
vars:
compass_distribution: compass
- func: test-packaged-app
vars:
mongodb_version: 8.0.5
compass_distribution: compass
e2e_test_groups: <%= E2E_TEST_GROUPS.length %>
e2e_test_group: <%= group.number %>
debug: 'compass-e2e-tests*,electron*,hadron*,mongo*'
<% } %>

<% for (const browser of BROWSERS) { %>
Expand Down
87 changes: 81 additions & 6 deletions .evergreen/buildvariants-and-tasks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -222,9 +222,9 @@ buildvariants:
- name: package-compass
variant: package-macos-arm
tasks:
- name: test-packaged-app-1
- name: test-packaged-app-2
- name: test-packaged-app-3
- name: test-packaged-app-macos13-1
- name: test-packaged-app-macos13-2
- name: test-packaged-app-macos13-3
- name: test-packaged-app-macos-11-x64
display_name: Test Packaged App MacOS x64 11
run_on: macos-11-gui
Expand All @@ -233,9 +233,9 @@ buildvariants:
- name: package-compass
variant: package-macos-x64
tasks:
- name: test-packaged-app-1
- name: test-packaged-app-2
- name: test-packaged-app-3
- name: test-packaged-app-macos13-1
- name: test-packaged-app-macos13-2
- name: test-packaged-app-macos13-3
- name: test-packaged-app-macos-14-arm
display_name: Test Packaged App MacOS arm64 14
run_on: macos-14-arm64-gui
Expand Down Expand Up @@ -1577,6 +1577,31 @@ tasks:
e2e_test_groups: 3
e2e_test_group: 1
debug: compass-e2e-tests*,electron*,hadron*,mongo*
- name: test-packaged-app-macos13-1
tags:
- required-for-publish
- run-on-pr
- assigned_to_jira_team_compass_compass
- foliage_check_task_only
commands:
- func: prepare
- func: install
- func: bootstrap
vars:
scope: compass-e2e-tests
- func: apply-compass-target-expansion
vars:
compass_distribution: compass
- func: get-packaged-app
vars:
compass_distribution: compass
- func: test-packaged-app
vars:
mongodb_version: 8.0.5
compass_distribution: compass
e2e_test_groups: 3
e2e_test_group: 1
debug: compass-e2e-tests*,electron*,hadron*,mongo*
- name: test-packaged-app-2
tags:
- required-for-publish
Expand All @@ -1602,6 +1627,31 @@ tasks:
e2e_test_groups: 3
e2e_test_group: 2
debug: compass-e2e-tests*,electron*,hadron*,mongo*
- name: test-packaged-app-macos13-2
tags:
- required-for-publish
- run-on-pr
- assigned_to_jira_team_compass_compass
- foliage_check_task_only
commands:
- func: prepare
- func: install
- func: bootstrap
vars:
scope: compass-e2e-tests
- func: apply-compass-target-expansion
vars:
compass_distribution: compass
- func: get-packaged-app
vars:
compass_distribution: compass
- func: test-packaged-app
vars:
mongodb_version: 8.0.5
compass_distribution: compass
e2e_test_groups: 3
e2e_test_group: 2
debug: compass-e2e-tests*,electron*,hadron*,mongo*
- name: test-packaged-app-3
tags:
- required-for-publish
Expand All @@ -1627,6 +1677,31 @@ tasks:
e2e_test_groups: 3
e2e_test_group: 3
debug: compass-e2e-tests*,electron*,hadron*,mongo*
- name: test-packaged-app-macos13-3
tags:
- required-for-publish
- run-on-pr
- assigned_to_jira_team_compass_compass
- foliage_check_task_only
commands:
- func: prepare
- func: install
- func: bootstrap
vars:
scope: compass-e2e-tests
- func: apply-compass-target-expansion
vars:
compass_distribution: compass
- func: get-packaged-app
vars:
compass_distribution: compass
- func: test-packaged-app
vars:
mongodb_version: 8.0.5
compass_distribution: compass
e2e_test_groups: 3
e2e_test_group: 3
debug: compass-e2e-tests*,electron*,hadron*,mongo*
- name: test-web-sandbox-chrome-1
tags:
- required-for-publish
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/test-installers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,10 @@ jobs:
DISTRO_ID: ${{ matrix.distro-id }}
# Exposing token to prevent update server from being rate limited
GITHUB_TOKEN: ${{ github.token }}
# mongodb 8.0.6 requires macOS 14+. Just use an older version for now
# so it will run on GitHub's mac runners
MONGODB_VERSION: "8.0.5"
Copy link
Contributor Author

@lerouxb lerouxb Mar 26, 2025

Choose a reason for hiding this comment

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

I thought of doing lots of work to only set this on macos 13, but then remembered that the database version is irrelevant to testing that compass installs, starts up and can auto-update.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

(I'm just hoping these env vars get passed down from the smoke tests process to the e2e tests process without further changes required.)

MONGODB_RUNNER_VERSION: "8.0.5"
working-directory: packages/compass-smoke-tests
# Using --skipUninstalling --skipCleanup because the runners are ephemeral
run: npm start -- --package ${{ matrix.package }} --tests ${{ matrix.test }} --skipUninstall --skipCleanup
Expand Down
Loading