Merge remote-tracking branch 'origin/beta-releases' into ga-releases

Author: github-actions[bot]

.evergreen/buildvariants-and-tasks.in.yml

@@ -246,14 +246,6 @@ buildvariants:
     - name: e2e-coverage-<%= group.number %>
     <% } %>
 
-  - name: e2e-multiple-connections
-    display_name: E2E Multiple Connections
-    run_on: ubuntu2004-large
-    tasks:
-    <% for(const group of E2E_TEST_GROUPS) { %>
-    - name: e2e-multiple-connections-<%= group.number %>
-    <% } %>
-
   - name: csfle-tests
     display_name: CSFLE Tests
     run_on: ubuntu2004-large
@@ -289,7 +281,11 @@ tasks:
       - func: check
 
   - name: test
-    tags: ['required-for-publish', 'run-on-pr']
+    tags: 
+      - required-for-publish
+      - run-on-pr
+      - assigned_to_jira_team_compass_compass
+      - foliage_creates_breaking_commit
     commands:
       - func: prepare
       - func: install
@@ -340,21 +336,6 @@ tasks:
           debug: 'compass-e2e-tests*,electron*,hadron*,mongo*'
 <% } %>
 
-<% for(const group of E2E_TEST_GROUPS) { %>
-  - name: e2e-multiple-connections-<%= group.number %>
-    tags: ['required-for-publish', 'run-on-pr']
-    commands:
-      - func: prepare
-      - func: install
-      - func: bootstrap
-      - func: test-multiple-connections
-        vars:
-          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
     tags: ['required-for-publish', 'run-on-pr']
     commands:
@@ -457,8 +438,10 @@ tasks:
 <% for(const group of E2E_TEST_GROUPS) { %>
   - name: test-packaged-app-<%= group.number %>
     tags:
-    - required-for-publish
-    - run-on-pr
+      - required-for-publish
+      - run-on-pr
+      - assigned_to_jira_team_compass_compass
+      - foliage_check_task_only
     commands:
       - func: prepare
       - func: install
@@ -483,7 +466,11 @@ tasks:
 <% for (const browser of BROWSERS) { %>
   <% for(const group of E2E_TEST_GROUPS) { %>
   - name: test-web-sandbox-<%= browser %>-<%= group.number %>
-    tags: ['required-for-publish', 'run-on-pr']
+    tags:
+      - required-for-publish
+      - run-on-pr
+      - assigned_to_jira_team_compass_compass
+      - foliage_check_task_only
     commands:
       - func: prepare
       - func: install

.evergreen/buildvariants-and-tasks.yml

@@ -220,13 +220,6 @@ buildvariants:
       - name: e2e-coverage-1
       - name: e2e-coverage-2
       - name: e2e-coverage-3
-  - name: e2e-multiple-connections
-    display_name: E2E Multiple Connections
-    run_on: ubuntu2004-large
-    tasks:
-      - name: e2e-multiple-connections-1
-      - name: e2e-multiple-connections-2
-      - name: e2e-multiple-connections-3
   - name: csfle-tests
     display_name: CSFLE Tests
     run_on: ubuntu2004-large
@@ -261,6 +254,8 @@ tasks:
     tags:
       - required-for-publish
       - run-on-pr
+      - assigned_to_jira_team_compass_compass
+      - foliage_creates_breaking_commit
     commands:
       - func: prepare
       - func: install
@@ -338,48 +333,6 @@ tasks:
           e2e_test_groups: 3
           e2e_test_group: 3
           debug: compass-e2e-tests*,electron*,hadron*,mongo*
-  - name: e2e-multiple-connections-1
-    tags:
-      - required-for-publish
-      - run-on-pr
-    commands:
-      - func: prepare
-      - func: install
-      - func: bootstrap
-      - func: test-multiple-connections
-        vars:
-          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
-      - run-on-pr
-    commands:
-      - func: prepare
-      - func: install
-      - func: bootstrap
-      - func: test-multiple-connections
-        vars:
-          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
-      - run-on-pr
-    commands:
-      - func: prepare
-      - func: install
-      - func: bootstrap
-      - func: test-multiple-connections
-        vars:
-          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
@@ -1531,6 +1484,8 @@ tasks:
     tags:
       - required-for-publish
       - run-on-pr
+      - assigned_to_jira_team_compass_compass
+      - foliage_check_task_only
     commands:
       - func: prepare
       - func: install
@@ -1554,6 +1509,8 @@ tasks:
     tags:
       - required-for-publish
       - run-on-pr
+      - assigned_to_jira_team_compass_compass
+      - foliage_check_task_only
     commands:
       - func: prepare
       - func: install
@@ -1577,6 +1534,8 @@ tasks:
     tags:
       - required-for-publish
       - run-on-pr
+      - assigned_to_jira_team_compass_compass
+      - foliage_check_task_only
     commands:
       - func: prepare
       - func: install
@@ -1600,6 +1559,8 @@ tasks:
     tags:
       - required-for-publish
       - run-on-pr
+      - assigned_to_jira_team_compass_compass
+      - foliage_check_task_only
     commands:
       - func: prepare
       - func: install
@@ -1621,6 +1582,8 @@ tasks:
     tags:
       - required-for-publish
       - run-on-pr
+      - assigned_to_jira_team_compass_compass
+      - foliage_check_task_only
     commands:
       - func: prepare
       - func: install
@@ -1642,6 +1605,8 @@ tasks:
     tags:
       - required-for-publish
       - run-on-pr
+      - assigned_to_jira_team_compass_compass
+      - foliage_check_task_only
     commands:
       - func: prepare
       - func: install
@@ -1663,6 +1628,8 @@ tasks:
     tags:
       - required-for-publish
       - run-on-pr
+      - assigned_to_jira_team_compass_compass
+      - foliage_check_task_only
     commands:
       - func: prepare
       - func: install
@@ -1684,6 +1651,8 @@ tasks:
     tags:
       - required-for-publish
       - run-on-pr
+      - assigned_to_jira_team_compass_compass
+      - foliage_check_task_only
     commands:
       - func: prepare
       - func: install
@@ -1705,6 +1674,8 @@ tasks:
     tags:
       - required-for-publish
       - run-on-pr
+      - assigned_to_jira_team_compass_compass
+      - foliage_check_task_only
     commands:
       - func: prepare
       - func: install

.evergreen/functions.yml

@@ -602,30 +602,6 @@ functions:
 
           tar czf coverage.tgz packages/compass-e2e-tests/coverage
 
-  test-multiple-connections:
-    - command: shell.exec
-      # Fail the task if it's idle for 10 mins
-      timeout_secs: 600
-      params:
-        working_dir: src
-        shell: bash
-        env:
-          <<: *compass-env
-          DEBUG: ${debug|}
-          MONGODB_VERSION: ${mongodb_version|}
-          MONGODB_RUNNER_VERSION: ${mongodb_version|}
-          E2E_TEST_GROUPS: ${e2e_test_groups}
-          E2E_TEST_GROUP: ${e2e_test_group}
-          HADRON_DISTRIBUTION: compass
-        script: |
-          set -e
-          # Load environment variables
-          eval $(.evergreen/print-compass-env.sh)
-
-          echo "Running E2E tests for multiple connections"
-
-          npm run --unsafe-perm --workspace compass-e2e-tests test-ci -- -- --test-multiple-connections
-
   test-packaged-app:
     - command: shell.exec
       # Fail the task if it's idle for 10 mins
@@ -980,28 +956,3 @@ functions:
             # Fails if the report failed and is not a patch, including release branches:
             exit $return_code
           fi
-
-  generative-ai-accuracy-tests:
-    - command: shell.exec
-      # Fail the task if it's idle for 10 mins
-      timeout_secs: 600
-      params:
-        working_dir: src
-        shell: bash
-        env:
-          <<: *compass-env
-          ATLAS_PUBLIC_KEY: ${atlas_public_key}
-          ATLAS_PRIVATE_KEY: ${atlas_private_key}
-          AI_ACCURACY_RESULTS_MONGODB_CONNECTION_STRING: ${accuracy_results_mdb_connection_string}
-        script: |
-          set -e
-          # Load environment variables
-          eval $(.evergreen/print-compass-env.sh)
-
-          set +e
-          npm run --workspace @mongodb-js/compass-generative-ai ai-accuracy-tests
-          return_code=$?
-          set -e
-
-          # Fail when the accuracy tests fail:
-          exit $return_code

.evergreen/generative-ai-accuracy-test-empty.yml

@@ -12,6 +12,8 @@ jobs:
   update_generated_files:
     name: Update automatically generated files
     runs-on: ubuntu-latest
+    env:
+      HADRON_DISTRIBUTION: compass
     steps:
       - uses: actions/checkout@v3
         with:

.evergreen/generative-ai-accuracy-test.yml

@@ -62,7 +62,6 @@ Is there anything else you’d like to see in Compass? Let us know by submitting
 - [**@mongodb-js/databases-collections-list**](packages/databases-collections-list): List view for the databases and collections
 - [**@mongodb-js/explain-plan-helper**](packages/explain-plan-helper): Explain plan utility methods for MongoDB Compass
 - [**@mongodb-js/my-queries-storage**](packages/my-queries-storage): Saved aggregations and queries storage
-- [**@mongodb-js/ssh-tunnel**](packages/ssh-tunnel): Yet another ssh tunnel based on ssh2
 - [**bson-transpilers**](packages/bson-transpilers): Source to source compilers using ANTLR
 - [**compass-e2e-tests**](packages/compass-e2e-tests): E2E test suite for Compass app that follows smoke tests / feature testing matrix
 - [**compass-preferences-model**](packages/compass-preferences-model): Compass preferences model