Skip to content
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

chore(e2e): test on latest-enterprise #6055

Merged
merged 3 commits into from
Jul 23, 2024
Merged

chore(e2e): test on latest-enterprise #6055

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c854e6c
test on latest-enterprise
lerouxb Jul 23, 2024
3a1dcfc
skip OIDC tests for multiple connections
lerouxb Jul 23, 2024
c580422
CSFLE / QE fixes
lerouxb Jul 23, 2024
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
5 changes: 3 additions & 2 deletions .evergreen/buildvariants-and-tasks.in.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,6 +352,7 @@ tasks:
e2e_test_groups: <%= E2E_TEST_GROUPS.length %>
e2e_test_group: <%= group.number %>
debug: 'compass-e2e-tests*,electron*,hadron*,mongo*'
mongodb_version: latest-enterprise
Copy link
Contributor Author

Choose a reason for hiding this comment

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

we didn't specify mongodb_version for multiple connections, so we got some default

<% } %>

- name: generate-vulnerability-report
Expand Down Expand Up @@ -472,7 +473,7 @@ tasks:
compass_distribution: compass
- func: test-packaged-app
vars:
mongodb_version: latest
mongodb_version: latest-enterprise
Copy link
Contributor Author

Choose a reason for hiding this comment

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

We probably mean enterprise, not community so that more tests would run.

compass_distribution: compass
e2e_test_groups: <%= E2E_TEST_GROUPS.length %>
e2e_test_group: <%= group.number %>
Expand All @@ -494,7 +495,7 @@ tasks:
compass_distribution: compass
- func: test-web-sandbox
vars:
mongodb_version: latest
mongodb_version: latest-enterprise
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Same here.

browser_name: '<%= browser %>'
compass_distribution: compass
e2e_test_groups: <%= E2E_TEST_GROUPS.length %>
Expand Down
21 changes: 12 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 @@ -351,6 +351,7 @@ tasks:
e2e_test_groups: 3
e2e_test_group: 1
debug: compass-e2e-tests*,electron*,hadron*,mongo*
mongodb_version: latest-enterprise
- name: e2e-multiple-connections-2
tags:
- required-for-publish
Expand All @@ -364,6 +365,7 @@ tasks:
e2e_test_groups: 3
e2e_test_group: 2
debug: compass-e2e-tests*,electron*,hadron*,mongo*
mongodb_version: latest-enterprise
- name: e2e-multiple-connections-3
tags:
- required-for-publish
Expand All @@ -377,6 +379,7 @@ tasks:
e2e_test_groups: 3
e2e_test_group: 3
debug: compass-e2e-tests*,electron*,hadron*,mongo*
mongodb_version: latest-enterprise
- name: generate-vulnerability-report
tags:
- required-for-publish
Expand Down Expand Up @@ -1542,7 +1545,7 @@ tasks:
compass_distribution: compass
- func: test-packaged-app
vars:
mongodb_version: latest
mongodb_version: latest-enterprise
compass_distribution: compass
e2e_test_groups: 3
e2e_test_group: 1
Expand All @@ -1565,7 +1568,7 @@ tasks:
compass_distribution: compass
- func: test-packaged-app
vars:
mongodb_version: latest
mongodb_version: latest-enterprise
compass_distribution: compass
e2e_test_groups: 3
e2e_test_group: 2
Expand All @@ -1588,7 +1591,7 @@ tasks:
compass_distribution: compass
- func: test-packaged-app
vars:
mongodb_version: latest
mongodb_version: latest-enterprise
compass_distribution: compass
e2e_test_groups: 3
e2e_test_group: 3
Expand All @@ -1608,7 +1611,7 @@ tasks:
compass_distribution: compass
- func: test-web-sandbox
vars:
mongodb_version: latest
mongodb_version: latest-enterprise
browser_name: chrome
compass_distribution: compass
e2e_test_groups: 3
Expand All @@ -1629,7 +1632,7 @@ tasks:
compass_distribution: compass
- func: test-web-sandbox
vars:
mongodb_version: latest
mongodb_version: latest-enterprise
browser_name: chrome
compass_distribution: compass
e2e_test_groups: 3
Expand All @@ -1650,7 +1653,7 @@ tasks:
compass_distribution: compass
- func: test-web-sandbox
vars:
mongodb_version: latest
mongodb_version: latest-enterprise
browser_name: chrome
compass_distribution: compass
e2e_test_groups: 3
Expand All @@ -1671,7 +1674,7 @@ tasks:
compass_distribution: compass
- func: test-web-sandbox
vars:
mongodb_version: latest
mongodb_version: latest-enterprise
browser_name: firefox
compass_distribution: compass
e2e_test_groups: 3
Expand All @@ -1692,7 +1695,7 @@ tasks:
compass_distribution: compass
- func: test-web-sandbox
vars:
mongodb_version: latest
mongodb_version: latest-enterprise
browser_name: firefox
compass_distribution: compass
e2e_test_groups: 3
Expand All @@ -1713,7 +1716,7 @@ tasks:
compass_distribution: compass
- func: test-web-sandbox
vars:
mongodb_version: latest
mongodb_version: latest-enterprise
browser_name: firefox
compass_distribution: compass
e2e_test_groups: 3
Expand Down
23 changes: 11 additions & 12 deletions packages/compass-e2e-tests/tests/in-use-encryption.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import {
serverSatisfies,
skipForWeb,
TEST_MULTIPLE_CONNECTIONS,
DEFAULT_CONNECTION_NAME,
} from '../helpers/compass';
import type { Compass } from '../helpers/compass';
import * as Selectors from '../helpers/selectors';
Expand Down Expand Up @@ -288,7 +287,7 @@ describe('CSFLE / QE', function () {
);

await browser.navigateToCollectionTab(
DEFAULT_CONNECTION_NAME,
connectionName,
databaseName,
collectionName,
'Documents'
Expand Down Expand Up @@ -428,7 +427,7 @@ describe('CSFLE / QE', function () {
);

await browser.navigateToCollectionTab(
DEFAULT_CONNECTION_NAME,
connectionName,
databaseName,
collectionName,
'Documents'
Expand All @@ -452,7 +451,7 @@ describe('CSFLE / QE', function () {
await refresh(browser, connectionName);

await browser.navigateToCollectionTab(
DEFAULT_CONNECTION_NAME,
connectionName,
databaseName,
collectionName,
'Documents'
Expand Down Expand Up @@ -515,7 +514,7 @@ describe('CSFLE / QE', function () {
await refresh(browser, connectionName);

await browser.navigateToCollectionTab(
DEFAULT_CONNECTION_NAME,
connectionName,
databaseName,
collectionName,
'Documents'
Expand Down Expand Up @@ -563,7 +562,7 @@ describe('CSFLE / QE', function () {
await refresh(browser, connectionName);

await browser.navigateToCollectionTab(
DEFAULT_CONNECTION_NAME,
connectionName,
databaseName,
coll,
'Documents'
Expand Down Expand Up @@ -633,7 +632,7 @@ describe('CSFLE / QE', function () {
await refresh(browser, connectionName);

await browser.navigateToCollectionTab(
DEFAULT_CONNECTION_NAME,
connectionName,
databaseName,
collectionName,
'Documents'
Expand Down Expand Up @@ -701,7 +700,7 @@ describe('CSFLE / QE', function () {

await refresh(browser, connectionName);
await browser.navigateToCollectionTab(
DEFAULT_CONNECTION_NAME,
connectionName,
databaseName,
collectionName,
'Documents'
Expand Down Expand Up @@ -784,7 +783,7 @@ describe('CSFLE / QE', function () {

await refresh(browser, connectionName);
await browser.navigateToCollectionTab(
DEFAULT_CONNECTION_NAME,
connectionName,
databaseName,
collectionName,
'Documents'
Expand Down Expand Up @@ -868,7 +867,7 @@ describe('CSFLE / QE', function () {
await refresh(browser, connectionName);

await browser.navigateToCollectionTab(
DEFAULT_CONNECTION_NAME,
connectionName,
databaseName,
collectionName,
'Documents'
Expand Down Expand Up @@ -1065,11 +1064,11 @@ describe('CSFLE / QE', function () {
hosts: [CONNECTION_HOSTS],
fleKeyVaultNamespace: `${databaseName}.keyvault`,
fleKey: 'A'.repeat(128),
connectionName: this.test?.fullTitle(),
connectionName,
});

await browser.navigateToCollectionTab(
DEFAULT_CONNECTION_NAME,
connectionName,
databaseName,
collectionName,
'Documents'
Expand Down
6 changes: 6 additions & 0 deletions packages/compass-e2e-tests/tests/oidc.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import {
skipForWeb,
TEST_COMPASS_WEB,
connectionNameFromString,
TEST_MULTIPLE_CONNECTIONS,
} from '../helpers/compass';
import * as Selectors from '../helpers/selectors';
import type { Compass } from '../helpers/compass';
Expand Down Expand Up @@ -78,6 +79,11 @@ describe('OIDC integration', function () {
before(async function () {
skipForWeb(this, 'feature flags not yet available in compass-web');

// TODO(COMPASS-8105): Fix and enable OIDC tests for multiple connections
if (TEST_MULTIPLE_CONNECTIONS) {
return this.skip();
}

// OIDC is only supported on Linux in the 7.0+ enterprise server.
if (
process.platform !== 'linux' ||
Expand Down
Loading