fixups: get everything to work! :)

Author: addaleax

.evergreen.yml

@@ -10604,7 +10604,7 @@ buildvariants:
     tags: []
     expansions:
       executable_os_id: darwin-arm64
-      mongosh_server_test_version: "8.2.0-rc4"
+      mongosh_server_test_version: "8.2.0"
       node_js_version: "20.19.5"
       mongosh_skip_node_version_check: ""
     tasks:
@@ -10637,7 +10637,7 @@ buildvariants:
     tags: []
     expansions:
       executable_os_id: darwin-arm64
-      mongosh_server_test_version: "8.2.0-rc4-enterprise"
+      mongosh_server_test_version: "8.2.0-enterprise"
       node_js_version: "20.19.5"
       mongosh_skip_node_version_check: ""
     tasks:
@@ -11099,7 +11099,7 @@ buildvariants:
     tags: ["nightly-driver"]
     expansions:
       executable_os_id: darwin-arm64
-      mongosh_server_test_version: "8.2.0-rc4"
+      mongosh_server_test_version: "8.2.0"
       node_js_version: "20.19.5"
       mongosh_skip_node_version_check: ""
     tasks:
@@ -11132,7 +11132,7 @@ buildvariants:
     tags: ["nightly-driver"]
     expansions:
       executable_os_id: darwin-arm64
-      mongosh_server_test_version: "8.2.0-rc4-enterprise"
+      mongosh_server_test_version: "8.2.0-enterprise"
       node_js_version: "20.19.5"
       mongosh_skip_node_version_check: ""
     tasks:
@@ -11614,7 +11614,7 @@ buildvariants:
     tags: []
     expansions:
       executable_os_id: win32
-      mongosh_server_test_version: "8.2.0-rc4"
+      mongosh_server_test_version: "8.2.0"
       node_js_version: "20.19.5"
       mongosh_skip_node_version_check: ""
     tasks:
@@ -11646,7 +11646,7 @@ buildvariants:
     tags: []
     expansions:
       executable_os_id: win32
-      mongosh_server_test_version: "8.2.0-rc4-enterprise"
+      mongosh_server_test_version: "8.2.0-enterprise"
       node_js_version: "20.19.5"
       mongosh_skip_node_version_check: ""
     tasks:

.evergreen/constants.js

@@ -37,8 +37,8 @@ exports.MONGODB_VERSIONS = [
   { shortName: '70xe', versionSpec: '7.0.x-enterprise' },
   { shortName: '80xc', versionSpec: '8.0.x' },
   { shortName: '80xe', versionSpec: '8.0.x-enterprise' },
-  { shortName: '82rc', versionSpec: '8.2.0-rc4' },
-  { shortName: '82rce', versionSpec: '8.2.0-rc4-enterprise' },
+  { shortName: '82rc', versionSpec: '8.2.0' },
+  { shortName: '82rce', versionSpec: '8.2.0-enterprise' },
   { shortName: 'latest', versionSpec: 'latest-alpha-enterprise' },
 ];
 

packages/build/src/packaging/download-crypt-library.ts

@@ -7,7 +7,8 @@ import type { PackageVariant } from '../config';
 import { getDistro, getArch } from '../config';
 
 export async function downloadCryptLibrary(
-  variant: PackageVariant | 'host'
+  variant: PackageVariant | 'host',
+  versionSpec = ''
 ): Promise<{ cryptLibrary: string; version: string }> {
   let opts: DownloadOptions = {};
   opts.arch = variant === 'host' ? undefined : getArch(variant);
@@ -32,18 +33,19 @@ export async function downloadCryptLibrary(
     'crypt-store',
     variant
   );
-  // Download mongodb for latest server version, including rapid releases
-  // (for the platforms that they exist for, i.e. for ppc64le/s390x only pick stable releases).
-  let versionSpec = '8.0.12'; // TODO(MONGOSH-2192): Switch back to 'continuous' and deal with affected platform support.
 
-  // For 8.2.0-rc4, we use the equivalent crypt shared library version for testing.
-  if (process.env.MONGOSH_SERVER_TEST_VERSION === '8.2.0-rc4-enterprise') {
-    versionSpec = '8.2.0-rc4';
-  } else if (/ppc64|s390x/.test(opts.arch || process.arch)) {
-    versionSpec = '8.0.12';
-  } else if ((opts.platform || process.platform) === 'darwin') {
-    versionSpec = '8.0.5'; // TBD(MONGOSH-2192,SERVER-101020): Figure out at what point we use a later version.
+  if (!versionSpec) {
+    // Download mongodb for latest server version, including rapid releases
+    // (for the platforms that they exist for, i.e. for ppc64le/s390x only pick stable releases).
+    versionSpec = '8.0.12'; // TODO(MONGOSH-2192): Switch back to 'continuous' and deal with affected platform support.
+
+    if (/ppc64|s390x/.test(opts.arch || process.arch)) {
+      versionSpec = '8.0.12';
+    } else if ((opts.platform || process.platform) === 'darwin') {
+      versionSpec = '8.0.5'; // TBD(MONGOSH-2192,SERVER-101020): Figure out at what point we use a later version.
+    }
   }
+
   const { downloadedBinDir: libdir, version } =
     await downloadMongoDbWithVersionInfo(cryptTmpTargetDir, versionSpec, opts);
   const cryptLibrary = path.join(
@@ -54,7 +56,9 @@ export async function downloadCryptLibrary(
   );
   // Make sure that the binary exists and is readable.
   await fs.access(cryptLibrary, fsConstants.R_OK);
-  console.info('mongosh: downloaded', cryptLibrary, 'version', version);
+  console.info(
+    `mongosh: downloaded ${cryptLibrary} version ${version} (requested: ${versionSpec})`
+  );
   return { cryptLibrary, version };
 }