Skip to content
Closed
Show file tree
Hide file tree
Changes from 1 commit
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
2 changes: 1 addition & 1 deletion .evergreen/buildvariants-and-tasks.in.yml
Original file line number Diff line number Diff line change
Expand Up @@ -468,7 +468,7 @@ tasks:
compass_distribution: <%= distribution %>
<% } %>

<% for (const distribution of ['compass']) { %>
<% for (const distribution of COMPASS_DISTRIBUTIONS) { %>
- name: smoketest-<%= distribution %>
tags: ['required-for-publish', 'run-on-pr']
commands:
Expand Down
30 changes: 30 additions & 0 deletions .evergreen/buildvariants-and-tasks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -515,6 +515,36 @@ tasks:
mongodb_version: 8.0.x-enterprise
compass_distribution: compass
debug: compass-e2e-tests*,electron*,hadron*,mongo*
- name: smoketest-compass-isolated
tags:
- required-for-publish
- run-on-pr
commands:
- func: prepare
- func: install
- func: bootstrap
vars:
scope: compass-e2e-tests
- func: smoketest-packaged-app
vars:
mongodb_version: 8.0.x-enterprise
compass_distribution: compass-isolated
debug: compass-e2e-tests*,electron*,hadron*,mongo*
- name: smoketest-compass-readonly
tags:
- required-for-publish
- run-on-pr
commands:
- func: prepare
- func: install
- func: bootstrap
vars:
scope: compass-e2e-tests
- func: smoketest-packaged-app
vars:
mongodb_version: 8.0.x-enterprise
compass_distribution: compass-readonly
debug: compass-e2e-tests*,electron*,hadron*,mongo*
- name: test-server-40x-community-1
tags:
- required-for-publish
Expand Down
10 changes: 8 additions & 2 deletions .evergreen/functions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -678,8 +678,14 @@ functions:

if [[ "$IS_WINDOWS" == "true" ]]; then
npm run --unsafe-perm --workspace @mongodb-js/compass-smoke-tests start -- --package=windows_setup --tests time-to-first-query
npm run --unsafe-perm --workspace @mongodb-js/compass-smoke-tests start -- --package=windows_zip --tests auto-update-from
npm run --unsafe-perm --workspace @mongodb-js/compass-smoke-tests start -- --package=windows_msi --tests auto-update-from
if [[ "$HADRON_DISTRIBUTION" == "compass-isolated"]]; then
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Part of me wants to keep this functions.yml clean so it specifies the full set for the default compass distribution case and then rather just override the tests parameter inside the cli to exclude the variants that won't work with the distribution.

Copy link
Contributor

Choose a reason for hiding this comment

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

I think we can easily clean this in the GHA:

# auto-update is not supported on isolated
npm run --unsafe-perm --workspace @mongodb-js/compass-smoke-tests start -- --package=windows_zip --tests time-to-first-query
npm run --unsafe-perm --workspace @mongodb-js/compass-smoke-tests start -- --package=windows_msi --tests time-to-first-query
else
npm run --unsafe-perm --workspace @mongodb-js/compass-smoke-tests start -- --package=windows_zip --tests auto-update-from
npm run --unsafe-perm --workspace @mongodb-js/compass-smoke-tests start -- --package=windows_msi --tests auto-update-from
fi
fi

if [[ "$IS_OSX" == "true" ]]; then
Expand Down
Loading