Skip to content

Commit 49e14d6

Browse files
authored
fix: stick to 8.0.5 for macOS crypt_shared and macOS 11 e2e tests (#2417)
1 parent 3531018 commit 49e14d6

File tree

3 files changed

+11
-8
lines changed

3 files changed

+11
-8
lines changed

.evergreen.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11485,27 +11485,27 @@ buildvariants:
1148511485
mongosh_test_e2e_force_fips: ""
1148611486
tasks:
1148711487
- name: e2e_tests_darwin_arm64
11488-
- name: e2e_tests_darwin
11489-
display_name: "MacOS Big Sur (E2E tests)"
11488+
- name: e2e_tests_darwin_m805
11489+
display_name: "MacOS Big Sur 805 (E2E tests)"
1149011490
run_on: macos-11
1149111491
tags: []
1149211492
expansions:
1149311493
executable_os_id: "darwin-x64"
1149411494
disable_openssl_shared_config_for_bundled_openssl: false
1149511495
node_js_version: "20.19.0"
11496-
mongosh_server_test_version: "stable-enterprise"
11496+
mongosh_server_test_version: "8.0.5-enterprise"
1149711497
mongosh_test_e2e_force_fips: ""
1149811498
tasks:
1149911499
- name: e2e_tests_darwin
11500-
- name: e2e_tests_darwin_arm64
11501-
display_name: "MacOS Big Sur arm64 (E2E tests)"
11500+
- name: e2e_tests_darwin_arm64_m805
11501+
display_name: "MacOS Big Sur arm64 805 (E2E tests)"
1150211502
run_on: macos-11-arm64
1150311503
tags: []
1150411504
expansions:
1150511505
executable_os_id: "darwin-arm64"
1150611506
disable_openssl_shared_config_for_bundled_openssl: false
1150711507
node_js_version: "20.19.0"
11508-
mongosh_server_test_version: "stable-enterprise"
11508+
mongosh_server_test_version: "8.0.5-enterprise"
1150911509
mongosh_test_e2e_force_fips: ""
1151011510
tasks:
1151111511
- name: e2e_tests_darwin_arm64

.evergreen/build-variants/e2e-tests-build-variants.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -328,14 +328,14 @@ exports.E2E_TESTS_BUILD_VARIANTS = [
328328
id: 'darwin',
329329
runOn: 'macos-11',
330330
executableOsId: 'darwin-x64',
331-
mVersion: 'stable',
331+
mVersion: '8.0.5',
332332
},
333333
{
334334
displayName: 'MacOS Big Sur arm64',
335335
runOn: 'macos-11-arm64',
336336
id: 'darwin_arm64',
337337
executableOsId: 'darwin-arm64',
338-
mVersion: 'stable',
338+
mVersion: '8.0.5',
339339
additionalTasks: [
340340
'package_artifact_darwin_x64',
341341
'sign_artifact_darwin_x64',

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,9 @@ export async function downloadCryptLibrary(
3838
if (/ppc64|s390x/.test(opts.arch || process.arch)) {
3939
versionSpec = 'stable';
4040
}
41+
if ((opts.platform || process.platform) === 'darwin') {
42+
versionSpec = '8.0.5'; // TBD(SERVER-101020): Figure out at what point we use a later version.
43+
}
4144
const { downloadedBinDir: libdir, version } =
4245
await downloadMongoDbWithVersionInfo(cryptTmpTargetDir, versionSpec, opts);
4346
const cryptLibrary = path.join(

0 commit comments

Comments
 (0)