From c854e6c3680e8ae8d0d6fd52a4ffb57b0170fb91 Mon Sep 17 00:00:00 2001 From: Le Roux Bodenstein Date: Tue, 23 Jul 2024 10:25:39 +0100 Subject: [PATCH 1/3] test on latest-enterprise --- .evergreen/buildvariants-and-tasks.in.yml | 5 +++-- .evergreen/buildvariants-and-tasks.yml | 21 ++++++++++++--------- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/.evergreen/buildvariants-and-tasks.in.yml b/.evergreen/buildvariants-and-tasks.in.yml index 5c2925f5085..010e6b8d925 100644 --- a/.evergreen/buildvariants-and-tasks.in.yml +++ b/.evergreen/buildvariants-and-tasks.in.yml @@ -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 <% } %> - name: generate-vulnerability-report @@ -472,7 +473,7 @@ tasks: compass_distribution: compass - func: test-packaged-app vars: - mongodb_version: latest + mongodb_version: latest-enterprise compass_distribution: compass e2e_test_groups: <%= E2E_TEST_GROUPS.length %> e2e_test_group: <%= group.number %> @@ -494,7 +495,7 @@ tasks: compass_distribution: compass - func: test-web-sandbox vars: - mongodb_version: latest + mongodb_version: latest-enterprise browser_name: '<%= browser %>' compass_distribution: compass e2e_test_groups: <%= E2E_TEST_GROUPS.length %> diff --git a/.evergreen/buildvariants-and-tasks.yml b/.evergreen/buildvariants-and-tasks.yml index 119bf981e02..87aa8c6166e 100644 --- a/.evergreen/buildvariants-and-tasks.yml +++ b/.evergreen/buildvariants-and-tasks.yml @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 From 3a1dcfcef7dfe874f371f94f7c04414b3db94844 Mon Sep 17 00:00:00 2001 From: Le Roux Bodenstein Date: Tue, 23 Jul 2024 11:05:09 +0100 Subject: [PATCH 2/3] skip OIDC tests for multiple connections --- packages/compass-e2e-tests/tests/oidc.test.ts | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/packages/compass-e2e-tests/tests/oidc.test.ts b/packages/compass-e2e-tests/tests/oidc.test.ts index 4d0296ef1ed..d00df6ee6bf 100644 --- a/packages/compass-e2e-tests/tests/oidc.test.ts +++ b/packages/compass-e2e-tests/tests/oidc.test.ts @@ -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'; @@ -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' || From c58042243dbd2464704ae19bbeb736a08b0d0f9a Mon Sep 17 00:00:00 2001 From: Le Roux Bodenstein Date: Tue, 23 Jul 2024 13:08:21 +0100 Subject: [PATCH 3/3] CSFLE / QE fixes --- .../tests/in-use-encryption.test.ts | 23 +++++++++---------- 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/packages/compass-e2e-tests/tests/in-use-encryption.test.ts b/packages/compass-e2e-tests/tests/in-use-encryption.test.ts index 088dc3fa66e..6c3ddbe7e3d 100644 --- a/packages/compass-e2e-tests/tests/in-use-encryption.test.ts +++ b/packages/compass-e2e-tests/tests/in-use-encryption.test.ts @@ -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'; @@ -288,7 +287,7 @@ describe('CSFLE / QE', function () { ); await browser.navigateToCollectionTab( - DEFAULT_CONNECTION_NAME, + connectionName, databaseName, collectionName, 'Documents' @@ -428,7 +427,7 @@ describe('CSFLE / QE', function () { ); await browser.navigateToCollectionTab( - DEFAULT_CONNECTION_NAME, + connectionName, databaseName, collectionName, 'Documents' @@ -452,7 +451,7 @@ describe('CSFLE / QE', function () { await refresh(browser, connectionName); await browser.navigateToCollectionTab( - DEFAULT_CONNECTION_NAME, + connectionName, databaseName, collectionName, 'Documents' @@ -515,7 +514,7 @@ describe('CSFLE / QE', function () { await refresh(browser, connectionName); await browser.navigateToCollectionTab( - DEFAULT_CONNECTION_NAME, + connectionName, databaseName, collectionName, 'Documents' @@ -563,7 +562,7 @@ describe('CSFLE / QE', function () { await refresh(browser, connectionName); await browser.navigateToCollectionTab( - DEFAULT_CONNECTION_NAME, + connectionName, databaseName, coll, 'Documents' @@ -633,7 +632,7 @@ describe('CSFLE / QE', function () { await refresh(browser, connectionName); await browser.navigateToCollectionTab( - DEFAULT_CONNECTION_NAME, + connectionName, databaseName, collectionName, 'Documents' @@ -701,7 +700,7 @@ describe('CSFLE / QE', function () { await refresh(browser, connectionName); await browser.navigateToCollectionTab( - DEFAULT_CONNECTION_NAME, + connectionName, databaseName, collectionName, 'Documents' @@ -784,7 +783,7 @@ describe('CSFLE / QE', function () { await refresh(browser, connectionName); await browser.navigateToCollectionTab( - DEFAULT_CONNECTION_NAME, + connectionName, databaseName, collectionName, 'Documents' @@ -868,7 +867,7 @@ describe('CSFLE / QE', function () { await refresh(browser, connectionName); await browser.navigateToCollectionTab( - DEFAULT_CONNECTION_NAME, + connectionName, databaseName, collectionName, 'Documents' @@ -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'