Merge branch 'main' into kh/increase-test-shell-timeout

Author: gagik

.evergreen.yml

@@ -35,7 +35,7 @@ rhel83-fips=false
 rhel83-zseries-small=false
 rhel90-arm64-small=false
 rhel90-small=false
-rhel92-fips=false
+rhel93-fips=false
 suse12-sp5-large=false
 suse15sp4-small=false
 ubuntu1804-arm64-large=false

.evergreen/compilation-context-expansions.test.sh

@@ -15,8 +15,8 @@ const MONGODB_VERSIONS = [
   { shortName: '60xe', versionSpec: '6.0.x-enterprise' },
   { shortName: '70xc', versionSpec: '7.0.x' },
   { shortName: '70xe', versionSpec: '7.0.x-enterprise' },
-  { shortName: '80xc', versionSpec: '8.0.0-rc17' },
-  { shortName: '80xe', versionSpec: '8.0.0-rc17-enterprise' },
+  { shortName: '80xc', versionSpec: '8.0.x' },
+  { shortName: '80xe', versionSpec: '8.0.x-enterprise' },
   { shortName: 'latest', versionSpec: 'latest-alpha-enterprise' }
 ];
 const NODE_VERSIONS = [
@@ -47,8 +47,11 @@ for (const packageInfo of MONGOSH_PACKAGES) {
       for (const { shortName: mShort, versionSpec: mVersion } of MONGODB_VERSIONS) {
         let variants = packageInfo.variants ?? defaultVariants;
         variants = (mShort === '42xe') ?
-          // The MongoDB 4.2 enterprise server does not work on Ubuntu 20.04
-          variants.filter(v => v !== 'linux') :
+          // The MongoDB 4.2 enterprise server does not work on Ubuntu 20.04 or arm64 macOS
+          variants.filter(v => v !== 'linux' && v !== 'darwin') :
+          // Unit tests on macOS use arm64 and therefore require 6.0+
+          (['42xc', '42xe', '44xc', '44xe', '50xc', '50xe'].includes(mShort)) ?
+          variants.filter(v => v !== 'darwin') :
           variants;
         const id = `m${mShort}_n${nShort}_${packageInfo.name.replace(/-/g, '_')}`;
         ALL_UNIT_TESTS.push({
@@ -68,6 +71,12 @@ const { RELEASE_PACKAGE_MATRIX } = require('../config/release-package-matrix');
 %>
 exec_timeout_secs: 10800
 
+pre:
+  - command: shell.exec
+    params:
+      shell: bash
+      script: |
+        rm -rf "$HOME/.mongodb/mongosh"
 post_error_fails_task: true
 post:
   - command: shell.exec
@@ -1198,7 +1207,7 @@ tasks:
   # E2E TESTS
   ###
   <% for (const { executableOsId, compileBuildVariant } of RELEASE_PACKAGE_MATRIX) {
-    for (const mVersion of ['stable', '8.0.0-rc17', '6.0.x']) {
+    for (const mVersion of ['stable', '7.0.x', '6.0.x']) {
       for (const fipsVariant of ['fips', 'nofips']) {
     %>
   - name: e2e_tests_<% out(executableOsId.replace(/-/g, '_')) %><% out(mVersion === 'stable' ? '' : '_' + mVersion.replace(/[^a-zA-Z0-9]/g, '')) %><% out(fipsVariant === 'fips' ? '_fips' : '') %>
@@ -1493,10 +1502,10 @@ tasks:
 # Need to run builds for every possible build variant.
 buildvariants:
   - name: darwin_unit
-    display_name: "MacOS Big Sur (Unit tests)"
-    run_on: macos-11
+    display_name: "MacOS 14 arm64 (Unit tests)"
+    run_on: macos-14-arm64
     expansions:
-      executable_os_id: darwin-x64
+      executable_os_id: darwin-arm64
     tasks:
       - name: check
       <% for (const test of ALL_UNIT_TESTS.filter(t => t.variants.includes('darwin'))) { %>
@@ -1676,13 +1685,13 @@ buildvariants:
     run_on: rhel70-large
     tags: ["nightly-driver"]
     tasks:
-      - name: e2e_tests_linux_x64
+      - name: e2e_tests_linux_x64_70x
   - name: e2e_rhel76_x64
     display_name: "RHEL 7.6 x64 (E2E Tests)"
     run_on: rhel76-large
     tags: ["nightly-driver"]
     tasks:
-      - name: e2e_tests_linux_x64
+      - name: e2e_tests_linux_x64_70x
   - name: e2e_rhel80_x64
     display_name: "RHEL 8.0 x64 (E2E Tests)"
     run_on: rhel80-small
@@ -1695,6 +1704,14 @@ buildvariants:
     expansions:
       disable_openssl_shared_config_for_bundled_openssl: true
     tags: ["nightly-driver"]
+    tasks:
+      - name: e2e_tests_linux_x64_70x
+  - name: e2e_rhel93_x64
+    display_name: "RHEL 9.3 x64 (E2E Tests)"
+    run_on: rhel93-small
+    expansions:
+      disable_openssl_shared_config_for_bundled_openssl: true
+    tags: ["nightly-driver"]
     tasks:
       - name: e2e_tests_linux_x64
   - name: e2e_rhel83_x64
@@ -1705,9 +1722,9 @@ buildvariants:
       - name: e2e_tests_linux_x64
       - name: e2e_tests_linux_x64_openssl11
       - name: e2e_tests_linux_x64_openssl11_fips
-  - name: e2e_rhel92_x64
-    display_name: "RHEL 9.2 x64 (E2E Tests, FIPS-available OS)"
-    run_on: rhel92-fips
+  - name: e2e_rhel93_fips_x64
+    display_name: "RHEL 9.3 x64 (E2E Tests, FIPS-available OS)"
+    run_on: rhel93-fips
     tags: ["nightly-driver"]
     tasks:
       - name: e2e_tests_linux_x64
@@ -1738,8 +1755,8 @@ buildvariants:
     run_on: ubuntu2404-small
     tags: ["nightly-driver"]
     tasks:
-      - name: e2e_tests_linux_x64_800rc17
-      - name: e2e_tests_linux_x64_openssl3_800rc17
+      - name: e2e_tests_linux_x64
+      - name: e2e_tests_linux_x64_openssl3
   - name: e2e_debian10_x64
     display_name: "Debian 10 x64 (E2E Tests)"
     run_on: debian10-small
@@ -1752,14 +1769,14 @@ buildvariants:
     run_on: debian11-small
     tags: ["nightly-driver"]
     tasks:
-      - name: e2e_tests_linux_x64
-      - name: e2e_tests_linux_x64_openssl11
+      - name: e2e_tests_linux_x64_70x
+      - name: e2e_tests_linux_x64_openssl11_70x
   - name: e2e_amazon2_x64
     display_name: "Amazon Linux 2 x64 (E2E Tests)"
     run_on: amazon2-large
     tags: ["nightly-driver"]
     tasks:
-      - name: e2e_tests_linux_x64
+      - name: e2e_tests_linux_x64_70x
   - name: e2e_amazon2023_x64
     display_name: "Amazon Linux 2023 x64 (E2E Tests)"
     run_on: amazon2023.0-small
@@ -1773,7 +1790,7 @@ buildvariants:
     run_on: suse12-sp5-large
     tags: ["nightly-driver"]
     tasks:
-      - name: e2e_tests_linux_x64
+      - name: e2e_tests_linux_x64_70x
   - name: e2e_suse15_x64
     display_name: "SLES 15 x64 (E2E Tests)"
     run_on: suse15sp4-small
@@ -1801,13 +1818,13 @@ buildvariants:
     display_name: "Ubuntu 24.04 arm64 (E2E Tests)"
     run_on: ubuntu2404-arm64-small
     tasks:
-      - name: e2e_tests_linux_arm64_800rc17
-      - name: e2e_tests_linux_arm64_openssl3_800rc17
+      - name: e2e_tests_linux_arm64
+      - name: e2e_tests_linux_arm64_openssl3
   - name: e2e_amazon2_arm64
     display_name: "Amazon Linux 2 arm64 (E2E Tests)"
     run_on: amazon2-arm64-large
     tasks:
-      - name: e2e_tests_linux_arm64
+      - name: e2e_tests_linux_arm64_70x
   - name: e2e_amazon2023_arm64
     display_name: "Amazon Linux 2023 arm64 (E2E Tests)"
     run_on: amazon2023.0-arm64-small
@@ -1823,6 +1840,14 @@ buildvariants:
   - name: e2e_rhel90_arm64
     display_name: "RHEL 9.0 arm64 (E2E Tests)"
     run_on: rhel90-arm64-small
+    expansions:
+      disable_openssl_shared_config_for_bundled_openssl: true
+    tasks:
+      - name: e2e_tests_linux_arm64_70x
+      - name: e2e_tests_linux_arm64_openssl3_70x
+  - name: e2e_rhel93_arm64
+    display_name: "RHEL 9.3 arm64 (E2E Tests)"
+    run_on: rhel93-arm64-small
     expansions:
       disable_openssl_shared_config_for_bundled_openssl: true
     tasks:

.evergreen/evergreen.yml.in

@@ -5,7 +5,7 @@ export BASEDIR="$PWD/.evergreen"
 if echo $NODE_JS_VERSION | grep -q ^16 ; then
   NPM_VERSION=9.9.2 # 9.9.3 does not install well on Windows
 else
-  NPM_VERSION=10.x
+  NPM_VERSION=10.8.3 # 10.9.0 does not install well on Windows
 fi
 
 if [ "$OS" == "Windows_NT" ]; then

.evergreen/install-node.sh

@@ -1,7 +1,7 @@
 {
-  "version": "20.17.0",
+  "version": "20.18.0",
   "major": 20,
-  "minor": 17,
+  "minor": 18,
   "patch": 0,
   "tag": "",
   "codename": "iron",
@@ -10,7 +10,7 @@
   "lts": "2023-10-24T00:00:00.000Z",
   "maintenance": "2024-10-22T00:00:00.000Z",
   "end": "2026-04-30T00:00:00.000Z",
-  "releaseDate": "2024-08-21T00:00:00.000Z",
+  "releaseDate": "2024-10-03T00:00:00.000Z",
   "isLts": true,
   "files": [
     "aix-ppc64",

.evergreen/node-20-latest.json

@@ -4,6 +4,7 @@ set -x
 export BASEDIR="$PWD/.evergreen"
 export PATH="/cygdrive/c/python/Python311/Scripts:/cygdrive/c/python/Python311:/cygdrive/c/Python311/Scripts:/cygdrive/c/Python311:/opt/python/3.6/bin:$BASEDIR/mingit/cmd:$BASEDIR/mingit/mingw64/libexec/git-core:$BASEDIR/git-2:$BASEDIR/npm-10/node_modules/.bin:$BASEDIR/node-v$NODE_JS_VERSION-win-x64:/opt/java/jdk16/bin:/opt/chefdk/gitbin:/cygdrive/c/cmake/bin:/opt/mongodbtoolchain/v3/bin:$PATH"
 
+export MONGOSH_TEST_ONLY_MAX_LOG_FILE_COUNT=100000
 export IS_MONGOSH_EVERGREEN_CI=1
 export DEBUG="mongodb*,$DEBUG"
 

.evergreen/setup-env.sh

@@ -39,3 +39,5 @@ dylrich <[email protected]>
 pulkitkalra-mdb <[email protected]>
 Alena Khineika <[email protected]>
 Orgad Shaneh <[email protected]>
+Kræn Hansen <[email protected]>
+Gagik Amaryan <[email protected]>