From 9e8118a10e89718f720cb83c366e05e83fedc4c7 Mon Sep 17 00:00:00 2001
From: Daniel Echlin <daniel.echlin@mongodb.com>
Date: Sat, 8 Feb 2025 14:45:44 -0500
Subject: [PATCH 1/6] improve error reporting

---
 .../tests/no-network-traffic.test.ts            | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/packages/compass-e2e-tests/tests/no-network-traffic.test.ts b/packages/compass-e2e-tests/tests/no-network-traffic.test.ts
index b913d6fc13c..fec35cab631 100644
--- a/packages/compass-e2e-tests/tests/no-network-traffic.test.ts
+++ b/packages/compass-e2e-tests/tests/no-network-traffic.test.ts
@@ -56,7 +56,7 @@ describe('networkTraffic: false / Isolated Edition', function () {
       const wrapperFile = path.join(tmpdir, 'wrap.sh');
       await fs.writeFile(
         wrapperFile,
-        `#!/bin/bash\nulimit -c 0; exec strace -f -e connect -qqq -o '${outfile}' '${binary}' "$@"\n`
+        `#!/bin/bash\nulimit -c 0; exec strace -f -e connect -tt -o '${outfile}' '${binary}' "$@"\n`
       );
       await fs.chmod(wrapperFile, 0o755);
       return wrapperFile;
@@ -115,12 +115,15 @@ describe('networkTraffic: false / Isolated Edition', function () {
       );
     }
 
-    if (
-      [...connectTargets].some(
-        (target) => !/^127.0.0.1:|^\[::1\]:/.test(target)
-      )
-    ) {
-      throw new Error(`Connected to unexpected host! ${[...connectTargets]}`);
+    const unexpectedHosts = [...connectTargets].filter(
+      (target) => !/^127.0.0.1:|^\[::1\]:/.test(target)
+    );
+    if (unexpectedHosts.length > 0) {
+      throw new Error(
+        `Connected to unexpected host! ${[
+          ...unexpectedHosts,
+        ]}. Here is the strace log:\n ${straceLog}`
+      );
     }
     if (![...connectTargets].some((target) => /:27091$/.test(target))) {
       throw new Error(

From 61a7670263fcd883356adda4253a5fea93d10bf1 Mon Sep 17 00:00:00 2001
From: Daniel Echlin <daniel.echlin@mongodb.com>
Date: Sat, 8 Feb 2025 14:47:19 -0500
Subject: [PATCH 2/6] run just one test

---
 packages/compass-e2e-tests/index.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/compass-e2e-tests/index.ts b/packages/compass-e2e-tests/index.ts
index 86a31aec1a1..c30f3dd6294 100644
--- a/packages/compass-e2e-tests/index.ts
+++ b/packages/compass-e2e-tests/index.ts
@@ -54,7 +54,7 @@ async function main() {
   const e2eTestGroup = context.testGroup;
   const e2eTestFilter = context.testFilter;
 
-  const tests = (
+  let tests = (
     await glob(`tests/**/${e2eTestFilter}.{test,spec}.ts`, {
       cwd: __dirname,
     })
@@ -82,6 +82,8 @@ async function main() {
       }
     });
 
+  tests = tests.filter((test) => test === 'tests/no-network-traffic.test.ts');
+
   debug('Test files:', tests);
 
   if (tests.length === 0) {

From feea54ee9d55ede2b4b7d261ad2629bcd9e8f401 Mon Sep 17 00:00:00 2001
From: Daniel Echlin <daniel.echlin@mongodb.com>
Date: Sat, 8 Feb 2025 20:14:51 -0500
Subject: [PATCH 3/6] try adding one earlier test

---
 packages/compass-e2e-tests/index.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/compass-e2e-tests/index.ts b/packages/compass-e2e-tests/index.ts
index c30f3dd6294..acf948b10d9 100644
--- a/packages/compass-e2e-tests/index.ts
+++ b/packages/compass-e2e-tests/index.ts
@@ -82,7 +82,11 @@ async function main() {
       }
     });
 
-  tests = tests.filter((test) => test === 'tests/no-network-traffic.test.ts');
+  tests = tests.filter(
+    (test) =>
+      test === 'tests/collection-heading.test.ts' ||
+      test === 'tests/no-network-traffic.test.ts'
+  );
 
   debug('Test files:', tests);
 

From 4f518726356c52df07479a406f164402f699c8ca Mon Sep 17 00:00:00 2001
From: Daniel Echlin <daniel.echlin@mongodb.com>
Date: Sat, 8 Feb 2025 20:24:32 -0500
Subject: [PATCH 4/6] welcome false

---
 packages/compass/src/app/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/compass/src/app/index.tsx b/packages/compass/src/app/index.tsx
index 620442ed9b6..983f0102557 100644
--- a/packages/compass/src/app/index.tsx
+++ b/packages/compass/src/app/index.tsx
@@ -238,7 +238,7 @@ const Application = View.extend({
       <React.StrictMode>
         <CompassElectron
           appName={remote.app.getName()}
-          showWelcomeModal={!wasNetworkOptInShown}
+          showWelcomeModal={false}
           createFileInputBackend={createElectronFileInputBackend(
             remote,
             webUtils

From 83da460a4e19c6e146addeb1c208e35c9e5a8d91 Mon Sep 17 00:00:00 2001
From: Daniel Echlin <daniel.echlin@mongodb.com>
Date: Sat, 8 Feb 2025 20:28:39 -0500
Subject: [PATCH 5/6] 1 test group

---
 .evergreen/buildvariants-and-tasks.in.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.evergreen/buildvariants-and-tasks.in.yml b/.evergreen/buildvariants-and-tasks.in.yml
index b77e22cc5b3..1d7f2c85d7b 100644
--- a/.evergreen/buildvariants-and-tasks.in.yml
+++ b/.evergreen/buildvariants-and-tasks.in.yml
@@ -175,7 +175,7 @@ const COMPASS_DISTRIBUTIONS = ["compass", "compass-isolated", "compass-readonly"
 
 const BROWSERS = ["chrome", "firefox"];
 
-const E2E_TEST_GROUPS_NUMBER = 3;
+const E2E_TEST_GROUPS_NUMBER = 1;
 const E2E_TEST_GROUPS = Array.from({ length: E2E_TEST_GROUPS_NUMBER }).map((_, i) => ({number: i + 1}));
 %>
 

From 0e3c538025df053e6da2417000ab7f075dd57507 Mon Sep 17 00:00:00 2001
From: Daniel Echlin <daniel.echlin@mongodb.com>
Date: Sat, 8 Feb 2025 20:38:49 -0500
Subject: [PATCH 6/6] big evergreen change

---
 .evergreen/buildvariants-and-tasks.yml | 1036 ++----------------------
 1 file changed, 63 insertions(+), 973 deletions(-)

diff --git a/.evergreen/buildvariants-and-tasks.yml b/.evergreen/buildvariants-and-tasks.yml
index d17f929c9b8..2fd2ad4cebe 100644
--- a/.evergreen/buildvariants-and-tasks.yml
+++ b/.evergreen/buildvariants-and-tasks.yml
@@ -109,29 +109,13 @@ buildvariants:
         variant: package-ubuntu
     tasks:
       - name: test-server-40x-community-1
-      - name: test-server-40x-community-2
-      - name: test-server-40x-community-3
       - name: test-server-40x-enterprise-1
-      - name: test-server-40x-enterprise-2
-      - name: test-server-40x-enterprise-3
       - name: test-server-42x-community-1
-      - name: test-server-42x-community-2
-      - name: test-server-42x-community-3
       - name: test-server-42x-enterprise-1
-      - name: test-server-42x-enterprise-2
-      - name: test-server-42x-enterprise-3
       - name: test-server-44x-community-1
-      - name: test-server-44x-community-2
-      - name: test-server-44x-community-3
       - name: test-server-44x-enterprise-1
-      - name: test-server-44x-enterprise-2
-      - name: test-server-44x-enterprise-3
       - name: test-server-5x-community-1
-      - name: test-server-5x-community-2
-      - name: test-server-5x-community-3
       - name: test-server-5x-enterprise-1
-      - name: test-server-5x-enterprise-2
-      - name: test-server-5x-enterprise-3
   - name: test-maintained-servers
     display_name: Test Maintained Servers
     run_on: ubuntu2004-large
@@ -141,23 +125,11 @@ buildvariants:
         variant: package-ubuntu
     tasks:
       - name: test-server-60x-community-1
-      - name: test-server-60x-community-2
-      - name: test-server-60x-community-3
       - name: test-server-60x-enterprise-1
-      - name: test-server-60x-enterprise-2
-      - name: test-server-60x-enterprise-3
       - name: test-server-70x-community-1
-      - name: test-server-70x-community-2
-      - name: test-server-70x-community-3
       - name: test-server-70x-enterprise-1
-      - name: test-server-70x-enterprise-2
-      - name: test-server-70x-enterprise-3
       - name: test-server-80x-community-1
-      - name: test-server-80x-community-2
-      - name: test-server-80x-community-3
       - name: test-server-80x-enterprise-1
-      - name: test-server-80x-enterprise-2
-      - name: test-server-80x-enterprise-3
   - name: test-latest-alpha
     display_name: Test Latest Alpha Server
     run_on: ubuntu2004-large
@@ -167,8 +139,6 @@ buildvariants:
         variant: package-ubuntu
     tasks:
       - name: test-server-latest-alpha-1
-      - name: test-server-latest-alpha-2
-      - name: test-server-latest-alpha-3
   - name: test-packaged-app-ubuntu
     display_name: Test Packaged App Ubuntu 20.04
     run_on: ubuntu2004-large
@@ -178,8 +148,6 @@ buildvariants:
         variant: package-ubuntu
     tasks:
       - name: test-packaged-app-1
-      - name: test-packaged-app-2
-      - name: test-packaged-app-3
   - name: test-packaged-app-windows
     display_name: Test Packaged App Windows 10
     run_on: windows-vsCurrent-large
@@ -189,8 +157,6 @@ buildvariants:
         variant: package-windows
     tasks:
       - name: test-packaged-app-1
-      - name: test-packaged-app-2
-      - name: test-packaged-app-3
   - name: test-packaged-app-rhel
     display_name: Test Packaged App RHEL 8.0
     run_on: rhel80-large
@@ -200,8 +166,6 @@ buildvariants:
         variant: package-rhel
     tasks:
       - name: test-packaged-app-1
-      - name: test-packaged-app-2
-      - name: test-packaged-app-3
   - name: test-packaged-app-macos-11-arm
     display_name: Test Packaged App MacOS arm64 11
     run_on: macos-11-arm64-gui
@@ -211,8 +175,6 @@ buildvariants:
         variant: package-macos-arm
     tasks:
       - name: test-packaged-app-1
-      - name: test-packaged-app-2
-      - name: test-packaged-app-3
   - name: test-packaged-app-macos-11-x64
     display_name: Test Packaged App MacOS x64 11
     run_on: macos-11-gui
@@ -222,8 +184,6 @@ buildvariants:
         variant: package-macos-x64
     tasks:
       - name: test-packaged-app-1
-      - name: test-packaged-app-2
-      - name: test-packaged-app-3
   - name: test-packaged-app-macos-14-arm
     display_name: Test Packaged App MacOS arm64 14
     run_on: macos-14-arm64-gui
@@ -233,8 +193,6 @@ buildvariants:
         variant: package-macos-arm
     tasks:
       - name: test-packaged-app-1
-      - name: test-packaged-app-2
-      - name: test-packaged-app-3
   - name: test-packaged-app-macos-14-x64
     display_name: Test Packaged App MacOS x64 14
     run_on: macos-14-gui
@@ -244,8 +202,6 @@ buildvariants:
         variant: package-macos-x64
     tasks:
       - name: test-packaged-app-1
-      - name: test-packaged-app-2
-      - name: test-packaged-app-3
   - name: publish
     display_name: Publish Artifacts
     run_on: ubuntu2004-large
@@ -263,8 +219,6 @@ buildvariants:
     run_on: ubuntu2004-large
     tasks:
       - name: e2e-coverage-1
-      - name: e2e-coverage-2
-      - name: e2e-coverage-3
   - name: csfle-tests
     display_name: CSFLE Tests
     run_on: ubuntu2004-large
@@ -275,11 +229,7 @@ buildvariants:
     run_on: ubuntu2004-large
     tasks:
       - name: test-web-sandbox-chrome-1
-      - name: test-web-sandbox-chrome-2
-      - name: test-web-sandbox-chrome-3
       - name: test-web-sandbox-firefox-1
-      - name: test-web-sandbox-firefox-2
-      - name: test-web-sandbox-firefox-3
   - name: test-web-sandbox-atlas-cloud
     display_name: Test Web Sandbox (w/ Atlas Cloud login)
     run_on: ubuntu2004-large
@@ -358,38 +308,10 @@ tasks:
       - func: bootstrap
       - func: e2e-coverage
         vars:
-          e2e_test_groups: 3
+          e2e_test_groups: 1
           e2e_test_group: 1
           debug: compass-e2e-tests*,electron*,hadron*,mongo*
           mongodb_version: 8.0.x-enterprise
-  - name: e2e-coverage-2
-    tags:
-      - required-for-publish
-      - run-on-pr
-    commands:
-      - func: prepare
-      - func: install
-      - func: bootstrap
-      - func: e2e-coverage
-        vars:
-          e2e_test_groups: 3
-          e2e_test_group: 2
-          debug: compass-e2e-tests*,electron*,hadron*,mongo*
-          mongodb_version: 8.0.x-enterprise
-  - name: e2e-coverage-3
-    tags:
-      - required-for-publish
-      - run-on-pr
-    commands:
-      - func: prepare
-      - func: install
-      - func: bootstrap
-      - func: e2e-coverage
-        vars:
-          e2e_test_groups: 3
-          e2e_test_group: 3
-          debug: compass-e2e-tests*,electron*,hadron*,mongo*
-          mongodb_version: 8.0.x-enterprise
   - name: generate-vulnerability-report
     tags:
       - required-for-publish
@@ -527,55 +449,9 @@ tasks:
         vars:
           mongodb_version: 4.0.x
           compass_distribution: compass
-          e2e_test_groups: 3
+          e2e_test_groups: 1
           e2e_test_group: 1
           debug: compass-e2e-tests*,electron*,hadron*,mongo*
-  - name: test-server-40x-community-2
-    tags:
-      - required-for-publish
-      - run-on-pr
-    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: 4.0.x
-          compass_distribution: compass
-          e2e_test_groups: 3
-          e2e_test_group: 2
-          debug: compass-e2e-tests*,electron*,hadron*,mongo*
-  - name: test-server-40x-community-3
-    tags:
-      - required-for-publish
-      - run-on-pr
-    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: 4.0.x
-          compass_distribution: compass
-          e2e_test_groups: 3
-          e2e_test_group: 3
-          debug: compass-e2e-tests*,electron*,hadron*,mongo*
   - name: test-server-40x-enterprise-1
     tags:
       - required-for-publish
@@ -596,55 +472,9 @@ tasks:
         vars:
           mongodb_version: 4.0.x-enterprise
           compass_distribution: compass
-          e2e_test_groups: 3
+          e2e_test_groups: 1
           e2e_test_group: 1
           debug: compass-e2e-tests*,electron*,hadron*,mongo*
-  - name: test-server-40x-enterprise-2
-    tags:
-      - required-for-publish
-      - run-on-pr
-    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: 4.0.x-enterprise
-          compass_distribution: compass
-          e2e_test_groups: 3
-          e2e_test_group: 2
-          debug: compass-e2e-tests*,electron*,hadron*,mongo*
-  - name: test-server-40x-enterprise-3
-    tags:
-      - required-for-publish
-      - run-on-pr
-    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: 4.0.x-enterprise
-          compass_distribution: compass
-          e2e_test_groups: 3
-          e2e_test_group: 3
-          debug: compass-e2e-tests*,electron*,hadron*,mongo*
   - name: test-server-42x-community-1
     tags:
       - required-for-publish
@@ -665,55 +495,9 @@ tasks:
         vars:
           mongodb_version: 4.2.x
           compass_distribution: compass
-          e2e_test_groups: 3
+          e2e_test_groups: 1
           e2e_test_group: 1
           debug: compass-e2e-tests*,electron*,hadron*,mongo*
-  - name: test-server-42x-community-2
-    tags:
-      - required-for-publish
-      - run-on-pr
-    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: 4.2.x
-          compass_distribution: compass
-          e2e_test_groups: 3
-          e2e_test_group: 2
-          debug: compass-e2e-tests*,electron*,hadron*,mongo*
-  - name: test-server-42x-community-3
-    tags:
-      - required-for-publish
-      - run-on-pr
-    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: 4.2.x
-          compass_distribution: compass
-          e2e_test_groups: 3
-          e2e_test_group: 3
-          debug: compass-e2e-tests*,electron*,hadron*,mongo*
   - name: test-server-42x-enterprise-1
     tags:
       - required-for-publish
@@ -734,55 +518,9 @@ tasks:
         vars:
           mongodb_version: 4.2.x-enterprise
           compass_distribution: compass
-          e2e_test_groups: 3
+          e2e_test_groups: 1
           e2e_test_group: 1
           debug: compass-e2e-tests*,electron*,hadron*,mongo*
-  - name: test-server-42x-enterprise-2
-    tags:
-      - required-for-publish
-      - run-on-pr
-    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: 4.2.x-enterprise
-          compass_distribution: compass
-          e2e_test_groups: 3
-          e2e_test_group: 2
-          debug: compass-e2e-tests*,electron*,hadron*,mongo*
-  - name: test-server-42x-enterprise-3
-    tags:
-      - required-for-publish
-      - run-on-pr
-    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: 4.2.x-enterprise
-          compass_distribution: compass
-          e2e_test_groups: 3
-          e2e_test_group: 3
-          debug: compass-e2e-tests*,electron*,hadron*,mongo*
   - name: test-server-44x-community-1
     tags:
       - required-for-publish
@@ -803,10 +541,10 @@ tasks:
         vars:
           mongodb_version: 4.4.x
           compass_distribution: compass
-          e2e_test_groups: 3
+          e2e_test_groups: 1
           e2e_test_group: 1
           debug: compass-e2e-tests*,electron*,hadron*,mongo*
-  - name: test-server-44x-community-2
+  - name: test-server-44x-enterprise-1
     tags:
       - required-for-publish
       - run-on-pr
@@ -824,12 +562,12 @@ tasks:
           compass_distribution: compass
       - func: test-packaged-app
         vars:
-          mongodb_version: 4.4.x
+          mongodb_version: 4.4.x-enterprise
           compass_distribution: compass
-          e2e_test_groups: 3
-          e2e_test_group: 2
+          e2e_test_groups: 1
+          e2e_test_group: 1
           debug: compass-e2e-tests*,electron*,hadron*,mongo*
-  - name: test-server-44x-community-3
+  - name: test-server-5x-community-1
     tags:
       - required-for-publish
       - run-on-pr
@@ -847,12 +585,12 @@ tasks:
           compass_distribution: compass
       - func: test-packaged-app
         vars:
-          mongodb_version: 4.4.x
+          mongodb_version: 5.x.x
           compass_distribution: compass
-          e2e_test_groups: 3
-          e2e_test_group: 3
+          e2e_test_groups: 1
+          e2e_test_group: 1
           debug: compass-e2e-tests*,electron*,hadron*,mongo*
-  - name: test-server-44x-enterprise-1
+  - name: test-server-5x-enterprise-1
     tags:
       - required-for-publish
       - run-on-pr
@@ -870,12 +608,12 @@ tasks:
           compass_distribution: compass
       - func: test-packaged-app
         vars:
-          mongodb_version: 4.4.x-enterprise
+          mongodb_version: 5.x.x-enterprise
           compass_distribution: compass
-          e2e_test_groups: 3
+          e2e_test_groups: 1
           e2e_test_group: 1
           debug: compass-e2e-tests*,electron*,hadron*,mongo*
-  - name: test-server-44x-enterprise-2
+  - name: test-server-60x-community-1
     tags:
       - required-for-publish
       - run-on-pr
@@ -893,12 +631,12 @@ tasks:
           compass_distribution: compass
       - func: test-packaged-app
         vars:
-          mongodb_version: 4.4.x-enterprise
+          mongodb_version: 6.0.x
           compass_distribution: compass
-          e2e_test_groups: 3
-          e2e_test_group: 2
+          e2e_test_groups: 1
+          e2e_test_group: 1
           debug: compass-e2e-tests*,electron*,hadron*,mongo*
-  - name: test-server-44x-enterprise-3
+  - name: test-server-60x-enterprise-1
     tags:
       - required-for-publish
       - run-on-pr
@@ -916,12 +654,12 @@ tasks:
           compass_distribution: compass
       - func: test-packaged-app
         vars:
-          mongodb_version: 4.4.x-enterprise
+          mongodb_version: 6.0.x-enterprise
           compass_distribution: compass
-          e2e_test_groups: 3
-          e2e_test_group: 3
+          e2e_test_groups: 1
+          e2e_test_group: 1
           debug: compass-e2e-tests*,electron*,hadron*,mongo*
-  - name: test-server-5x-community-1
+  - name: test-server-70x-community-1
     tags:
       - required-for-publish
       - run-on-pr
@@ -939,12 +677,12 @@ tasks:
           compass_distribution: compass
       - func: test-packaged-app
         vars:
-          mongodb_version: 5.x.x
+          mongodb_version: 7.0.x
           compass_distribution: compass
-          e2e_test_groups: 3
+          e2e_test_groups: 1
           e2e_test_group: 1
           debug: compass-e2e-tests*,electron*,hadron*,mongo*
-  - name: test-server-5x-community-2
+  - name: test-server-70x-enterprise-1
     tags:
       - required-for-publish
       - run-on-pr
@@ -962,12 +700,12 @@ tasks:
           compass_distribution: compass
       - func: test-packaged-app
         vars:
-          mongodb_version: 5.x.x
+          mongodb_version: 7.0.x-enterprise
           compass_distribution: compass
-          e2e_test_groups: 3
-          e2e_test_group: 2
+          e2e_test_groups: 1
+          e2e_test_group: 1
           debug: compass-e2e-tests*,electron*,hadron*,mongo*
-  - name: test-server-5x-community-3
+  - name: test-server-80x-community-1
     tags:
       - required-for-publish
       - run-on-pr
@@ -985,12 +723,12 @@ tasks:
           compass_distribution: compass
       - func: test-packaged-app
         vars:
-          mongodb_version: 5.x.x
+          mongodb_version: 8.0.x
           compass_distribution: compass
-          e2e_test_groups: 3
-          e2e_test_group: 3
+          e2e_test_groups: 1
+          e2e_test_group: 1
           debug: compass-e2e-tests*,electron*,hadron*,mongo*
-  - name: test-server-5x-enterprise-1
+  - name: test-server-80x-enterprise-1
     tags:
       - required-for-publish
       - run-on-pr
@@ -1008,12 +746,12 @@ tasks:
           compass_distribution: compass
       - func: test-packaged-app
         vars:
-          mongodb_version: 5.x.x-enterprise
+          mongodb_version: 8.0.x-enterprise
           compass_distribution: compass
-          e2e_test_groups: 3
+          e2e_test_groups: 1
           e2e_test_group: 1
           debug: compass-e2e-tests*,electron*,hadron*,mongo*
-  - name: test-server-5x-enterprise-2
+  - name: test-server-latest-alpha-1
     tags:
       - required-for-publish
       - run-on-pr
@@ -1031,15 +769,17 @@ tasks:
           compass_distribution: compass
       - func: test-packaged-app
         vars:
-          mongodb_version: 5.x.x-enterprise
+          mongodb_version: latest-alpha-enterprise
           compass_distribution: compass
-          e2e_test_groups: 3
-          e2e_test_group: 2
+          e2e_test_groups: 1
+          e2e_test_group: 1
           debug: compass-e2e-tests*,electron*,hadron*,mongo*
-  - name: test-server-5x-enterprise-3
+  - name: test-packaged-app-1
     tags:
       - required-for-publish
       - run-on-pr
+      - assigned_to_jira_team_compass_compass
+      - foliage_check_task_only
     commands:
       - func: prepare
       - func: install
@@ -1054,15 +794,17 @@ tasks:
           compass_distribution: compass
       - func: test-packaged-app
         vars:
-          mongodb_version: 5.x.x-enterprise
+          mongodb_version: 8.0.x-enterprise
           compass_distribution: compass
-          e2e_test_groups: 3
-          e2e_test_group: 3
+          e2e_test_groups: 1
+          e2e_test_group: 1
           debug: compass-e2e-tests*,electron*,hadron*,mongo*
-  - name: test-server-60x-community-1
+  - name: test-web-sandbox-chrome-1
     tags:
       - required-for-publish
       - run-on-pr
+      - assigned_to_jira_team_compass_compass
+      - foliage_check_task_only
     commands:
       - func: prepare
       - func: install
@@ -1072,20 +814,20 @@ tasks:
       - func: apply-compass-target-expansion
         vars:
           compass_distribution: compass
-      - func: get-packaged-app
-        vars:
-          compass_distribution: compass
-      - func: test-packaged-app
+      - func: test-web-sandbox
         vars:
-          mongodb_version: 6.0.x
+          mongodb_version: 8.0.x-enterprise
+          browser_name: chrome
           compass_distribution: compass
-          e2e_test_groups: 3
+          e2e_test_groups: 1
           e2e_test_group: 1
           debug: compass-e2e-tests*,electron*,hadron*,mongo*
-  - name: test-server-60x-community-2
+  - name: test-web-sandbox-firefox-1
     tags:
       - required-for-publish
       - run-on-pr
+      - assigned_to_jira_team_compass_compass
+      - foliage_check_task_only
     commands:
       - func: prepare
       - func: install
@@ -1095,666 +837,14 @@ tasks:
       - func: apply-compass-target-expansion
         vars:
           compass_distribution: compass
-      - func: get-packaged-app
-        vars:
-          compass_distribution: compass
-      - func: test-packaged-app
+      - func: test-web-sandbox
         vars:
-          mongodb_version: 6.0.x
+          mongodb_version: 8.0.x-enterprise
+          browser_name: firefox
           compass_distribution: compass
-          e2e_test_groups: 3
-          e2e_test_group: 2
-          debug: compass-e2e-tests*,electron*,hadron*,mongo*
-  - name: test-server-60x-community-3
-    tags:
-      - required-for-publish
-      - run-on-pr
-    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: 6.0.x
-          compass_distribution: compass
-          e2e_test_groups: 3
-          e2e_test_group: 3
-          debug: compass-e2e-tests*,electron*,hadron*,mongo*
-  - name: test-server-60x-enterprise-1
-    tags:
-      - required-for-publish
-      - run-on-pr
-    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: 6.0.x-enterprise
-          compass_distribution: compass
-          e2e_test_groups: 3
-          e2e_test_group: 1
-          debug: compass-e2e-tests*,electron*,hadron*,mongo*
-  - name: test-server-60x-enterprise-2
-    tags:
-      - required-for-publish
-      - run-on-pr
-    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: 6.0.x-enterprise
-          compass_distribution: compass
-          e2e_test_groups: 3
-          e2e_test_group: 2
-          debug: compass-e2e-tests*,electron*,hadron*,mongo*
-  - name: test-server-60x-enterprise-3
-    tags:
-      - required-for-publish
-      - run-on-pr
-    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: 6.0.x-enterprise
-          compass_distribution: compass
-          e2e_test_groups: 3
-          e2e_test_group: 3
-          debug: compass-e2e-tests*,electron*,hadron*,mongo*
-  - name: test-server-70x-community-1
-    tags:
-      - required-for-publish
-      - run-on-pr
-    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: 7.0.x
-          compass_distribution: compass
-          e2e_test_groups: 3
-          e2e_test_group: 1
-          debug: compass-e2e-tests*,electron*,hadron*,mongo*
-  - name: test-server-70x-community-2
-    tags:
-      - required-for-publish
-      - run-on-pr
-    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: 7.0.x
-          compass_distribution: compass
-          e2e_test_groups: 3
-          e2e_test_group: 2
-          debug: compass-e2e-tests*,electron*,hadron*,mongo*
-  - name: test-server-70x-community-3
-    tags:
-      - required-for-publish
-      - run-on-pr
-    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: 7.0.x
-          compass_distribution: compass
-          e2e_test_groups: 3
-          e2e_test_group: 3
-          debug: compass-e2e-tests*,electron*,hadron*,mongo*
-  - name: test-server-70x-enterprise-1
-    tags:
-      - required-for-publish
-      - run-on-pr
-    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: 7.0.x-enterprise
-          compass_distribution: compass
-          e2e_test_groups: 3
-          e2e_test_group: 1
-          debug: compass-e2e-tests*,electron*,hadron*,mongo*
-  - name: test-server-70x-enterprise-2
-    tags:
-      - required-for-publish
-      - run-on-pr
-    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: 7.0.x-enterprise
-          compass_distribution: compass
-          e2e_test_groups: 3
-          e2e_test_group: 2
-          debug: compass-e2e-tests*,electron*,hadron*,mongo*
-  - name: test-server-70x-enterprise-3
-    tags:
-      - required-for-publish
-      - run-on-pr
-    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: 7.0.x-enterprise
-          compass_distribution: compass
-          e2e_test_groups: 3
-          e2e_test_group: 3
-          debug: compass-e2e-tests*,electron*,hadron*,mongo*
-  - name: test-server-80x-community-1
-    tags:
-      - required-for-publish
-      - run-on-pr
-    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.x
-          compass_distribution: compass
-          e2e_test_groups: 3
-          e2e_test_group: 1
-          debug: compass-e2e-tests*,electron*,hadron*,mongo*
-  - name: test-server-80x-community-2
-    tags:
-      - required-for-publish
-      - run-on-pr
-    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.x
-          compass_distribution: compass
-          e2e_test_groups: 3
-          e2e_test_group: 2
-          debug: compass-e2e-tests*,electron*,hadron*,mongo*
-  - name: test-server-80x-community-3
-    tags:
-      - required-for-publish
-      - run-on-pr
-    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.x
-          compass_distribution: compass
-          e2e_test_groups: 3
-          e2e_test_group: 3
-          debug: compass-e2e-tests*,electron*,hadron*,mongo*
-  - name: test-server-80x-enterprise-1
-    tags:
-      - required-for-publish
-      - run-on-pr
-    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.x-enterprise
-          compass_distribution: compass
-          e2e_test_groups: 3
-          e2e_test_group: 1
-          debug: compass-e2e-tests*,electron*,hadron*,mongo*
-  - name: test-server-80x-enterprise-2
-    tags:
-      - required-for-publish
-      - run-on-pr
-    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.x-enterprise
-          compass_distribution: compass
-          e2e_test_groups: 3
-          e2e_test_group: 2
-          debug: compass-e2e-tests*,electron*,hadron*,mongo*
-  - name: test-server-80x-enterprise-3
-    tags:
-      - required-for-publish
-      - run-on-pr
-    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.x-enterprise
-          compass_distribution: compass
-          e2e_test_groups: 3
-          e2e_test_group: 3
-          debug: compass-e2e-tests*,electron*,hadron*,mongo*
-  - name: test-server-latest-alpha-1
-    tags:
-      - required-for-publish
-      - run-on-pr
-    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: latest-alpha-enterprise
-          compass_distribution: compass
-          e2e_test_groups: 3
-          e2e_test_group: 1
-          debug: compass-e2e-tests*,electron*,hadron*,mongo*
-  - name: test-server-latest-alpha-2
-    tags:
-      - required-for-publish
-      - run-on-pr
-    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: latest-alpha-enterprise
-          compass_distribution: compass
-          e2e_test_groups: 3
-          e2e_test_group: 2
-          debug: compass-e2e-tests*,electron*,hadron*,mongo*
-  - name: test-server-latest-alpha-3
-    tags:
-      - required-for-publish
-      - run-on-pr
-    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: latest-alpha-enterprise
-          compass_distribution: compass
-          e2e_test_groups: 3
-          e2e_test_group: 3
-          debug: compass-e2e-tests*,electron*,hadron*,mongo*
-  - name: test-packaged-app-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.x-enterprise
-          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
-      - 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.x-enterprise
-          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
-      - 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.x-enterprise
-          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
-      - 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: test-web-sandbox
-        vars:
-          mongodb_version: 8.0.x-enterprise
-          browser_name: chrome
-          compass_distribution: compass
-          e2e_test_groups: 3
-          e2e_test_group: 1
-          debug: compass-e2e-tests*,electron*,hadron*,mongo*
-  - name: test-web-sandbox-chrome-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: test-web-sandbox
-        vars:
-          mongodb_version: 8.0.x-enterprise
-          browser_name: chrome
-          compass_distribution: compass
-          e2e_test_groups: 3
-          e2e_test_group: 2
-          debug: compass-e2e-tests*,electron*,hadron*,mongo*
-  - name: test-web-sandbox-chrome-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: test-web-sandbox
-        vars:
-          mongodb_version: 8.0.x-enterprise
-          browser_name: chrome
-          compass_distribution: compass
-          e2e_test_groups: 3
-          e2e_test_group: 3
-          debug: compass-e2e-tests*,electron*,hadron*,mongo*
-  - name: test-web-sandbox-firefox-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: test-web-sandbox
-        vars:
-          mongodb_version: 8.0.x-enterprise
-          browser_name: firefox
-          compass_distribution: compass
-          e2e_test_groups: 3
+          e2e_test_groups: 1
           e2e_test_group: 1
           debug: compass-e2e-tests*,electron*,hadron*,mongo*
-  - name: test-web-sandbox-firefox-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: test-web-sandbox
-        vars:
-          mongodb_version: 8.0.x-enterprise
-          browser_name: firefox
-          compass_distribution: compass
-          e2e_test_groups: 3
-          e2e_test_group: 2
-          debug: compass-e2e-tests*,electron*,hadron*,mongo*
-  - name: test-web-sandbox-firefox-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: test-web-sandbox
-        vars:
-          mongodb_version: 8.0.x-enterprise
-          browser_name: firefox
-          compass_distribution: compass
-          e2e_test_groups: 3
-          e2e_test_group: 3
-          debug: compass-e2e-tests*,electron*,hadron*,mongo*
   - name: test-web-sandbox-atlas-cloud
     tags:
       - required-for-publish