From c9ea9760eeea4b1ffc9523fbde6fc5dc56f7da2b Mon Sep 17 00:00:00 2001 From: Anna Henningsen Date: Thu, 11 Dec 2025 17:30:45 +0100 Subject: [PATCH] chore(ci): remove references to 8.2.0-rc and use proper version Use stable `8.2.x` versions, given that they have been available for a while. --- .evergreen.yml | 38 +++++++++---------- .../e2e-tests-build-variants.js | 16 +++----- 2 files changed, 24 insertions(+), 30 deletions(-) diff --git a/.evergreen.yml b/.evergreen.yml index afc2646b6..328b52036 100644 --- a/.evergreen.yml +++ b/.evergreen.yml @@ -14362,14 +14362,14 @@ buildvariants: mongosh_test_e2e_force_fips: "" tasks: - name: e2e_tests_linux_arm64_openssl3 - - name: e2e_tests_ubuntu2404_arm64_small_openssl3_m820-rc4 - display_name: "Ubuntu 24.04 arm64 820-rc4 openssl3 (E2E tests)" + - name: e2e_tests_ubuntu2404_arm64_small_openssl3_m82x + display_name: "Ubuntu 24.04 arm64 82x openssl3 (E2E tests)" run_on: ubuntu2404-arm64-small tags: [] expansions: executable_os_id: "linux-arm64-openssl3" node_js_version: "20.19.6" - mongosh_server_test_version: "8.2.0-rc4-enterprise" + mongosh_server_test_version: "8.2.x-enterprise" mongosh_test_e2e_force_fips: "" tasks: - name: e2e_tests_linux_arm64_openssl3 @@ -14395,14 +14395,14 @@ buildvariants: mongosh_test_e2e_force_fips: "" tasks: - name: e2e_tests_linux_arm64 - - name: e2e_tests_amazon2023.0_arm64_small_m820-rc4 - display_name: "Amazon Linux 2023 arm64 820-rc4 (E2E tests)" + - name: e2e_tests_amazon2023.0_arm64_small_m82x + display_name: "Amazon Linux 2023 arm64 82x (E2E tests)" run_on: amazon2023.0-arm64-small tags: [] expansions: executable_os_id: "linux-arm64" node_js_version: "20.19.6" - mongosh_server_test_version: "8.2.0-rc4-enterprise" + mongosh_server_test_version: "8.2.x-enterprise" mongosh_test_e2e_force_fips: "" tasks: - name: e2e_tests_linux_arm64 @@ -14483,14 +14483,14 @@ buildvariants: mongosh_test_e2e_force_fips: "" tasks: - name: e2e_tests_linux_ppc64le - - name: e2e_tests_rhel9_power_small_m820-rc4 - display_name: "RHEL 9 PPC 820-rc4 (E2E tests)" + - name: e2e_tests_rhel9_power_small_m82x + display_name: "RHEL 9 PPC 82x (E2E tests)" run_on: rhel9-power-small tags: [] expansions: executable_os_id: "linux-ppc64le" node_js_version: "20.19.6" - mongosh_server_test_version: "8.2.0-rc4-enterprise" + mongosh_server_test_version: "8.2.x-enterprise" mongosh_test_e2e_force_fips: "" tasks: - name: e2e_tests_linux_ppc64le @@ -14527,14 +14527,14 @@ buildvariants: mongosh_test_e2e_force_fips: "" tasks: - name: e2e_tests_linux_s390x - - name: e2e_tests_rhel9_zseries_small_m820-rc4 - display_name: "RHEL 9 s390x 820-rc4 (E2E tests)" + - name: e2e_tests_rhel9_zseries_small_m82x + display_name: "RHEL 9 s390x 82x (E2E tests)" run_on: rhel9-zseries-small tags: [] expansions: executable_os_id: "linux-s390x" node_js_version: "20.19.6" - mongosh_server_test_version: "8.2.0-rc4-enterprise" + mongosh_server_test_version: "8.2.x-enterprise" mongosh_test_e2e_force_fips: "" tasks: - name: e2e_tests_linux_s390x @@ -14560,14 +14560,14 @@ buildvariants: mongosh_test_e2e_force_fips: "" tasks: - name: e2e_tests_darwin_arm64 - - name: e2e_tests_macos_14_arm64_m820-rc4 - display_name: "MacOS 14 arm64 820-rc4 (E2E tests)" + - name: e2e_tests_macos_14_arm64_m82x + display_name: "MacOS 14 arm64 82x (E2E tests)" run_on: macos-14-arm64 tags: [] expansions: executable_os_id: "darwin-arm64" node_js_version: "20.19.6" - mongosh_server_test_version: "8.2.0-rc4-enterprise" + mongosh_server_test_version: "8.2.x-enterprise" mongosh_test_e2e_force_fips: "" tasks: - name: e2e_tests_darwin_arm64 @@ -14610,19 +14610,17 @@ buildvariants: - name: e2e_tests_win32 - name: package_artifact_win32_x64 - name: package_artifact_win32msi_x64 - - name: e2e_tests_windows_vsCurrent_small_m820-rc4 - display_name: "Windows VS 2022 820-rc4 (E2E tests)" + - name: e2e_tests_windows_vsCurrent_small_m82x + display_name: "Windows VS 2022 82x (E2E tests)" run_on: windows-vsCurrent-small tags: [] expansions: executable_os_id: "win32" node_js_version: "20.19.6" - mongosh_server_test_version: "8.2.0-rc4-enterprise" + mongosh_server_test_version: "8.2.x-enterprise" mongosh_test_e2e_force_fips: "" tasks: - name: e2e_tests_win32 - - name: package_artifact_win32_x64 - - name: package_artifact_win32msi_x64 - name: linux_compile display_name: "Ubuntu 20.04 x64 (Compile and Check)" diff --git a/.evergreen/build-variants/e2e-tests-build-variants.js b/.evergreen/build-variants/e2e-tests-build-variants.js index 68fa3c832..3f65ad22c 100644 --- a/.evergreen/build-variants/e2e-tests-build-variants.js +++ b/.evergreen/build-variants/e2e-tests-build-variants.js @@ -246,7 +246,7 @@ exports.E2E_TESTS_BUILD_VARIANTS = [ runOn: 'ubuntu2404-arm64-small', sharedOpenSsl: 'openssl3', executableOsId: 'linux-arm64-openssl3', - mVersion: '8.2.0-rc4', + mVersion: '8.2.x', }, { displayName: 'Amazon Linux 2 arm64', @@ -264,7 +264,7 @@ exports.E2E_TESTS_BUILD_VARIANTS = [ displayName: 'Amazon Linux 2023 arm64', runOn: 'amazon2023.0-arm64-small', executableOsId: 'linux-arm64', - mVersion: '8.2.0-rc4', + mVersion: '8.2.x', }, { displayName: 'RHEL 8.2 arm64', @@ -314,7 +314,7 @@ exports.E2E_TESTS_BUILD_VARIANTS = [ displayName: 'RHEL 9 PPC', runOn: 'rhel9-power-small', executableOsId: 'linux-ppc64le', - mVersion: '8.2.0-rc4', + mVersion: '8.2.x', }, { displayName: 'RHEL 7 s390x', @@ -338,7 +338,7 @@ exports.E2E_TESTS_BUILD_VARIANTS = [ displayName: 'RHEL 9 s390x', runOn: 'rhel9-zseries-small', executableOsId: 'linux-s390x', - mVersion: '8.2.0-rc4', + mVersion: '8.2.x', }, { displayName: 'MacOS 14 x64', @@ -356,7 +356,7 @@ exports.E2E_TESTS_BUILD_VARIANTS = [ displayName: 'MacOS 14 arm64', runOn: 'macos-14-arm64', executableOsId: 'darwin-arm64', - mVersion: '8.2.0-rc4', + mVersion: '8.2.x', }, { displayName: 'MacOS Big Sur', @@ -392,11 +392,7 @@ exports.E2E_TESTS_BUILD_VARIANTS = [ displayName: 'Windows VS 2022', runOn: 'windows-vsCurrent-small', executableOsId: 'win32', - mVersion: '8.2.0-rc4', - additionalTasks: [ - 'package_artifact_win32_x64', - 'package_artifact_win32msi_x64', - ], + mVersion: '8.2.x' }, ].map((buildVariant) => { const { displayName, fips, sharedOpenSsl, mVersion, runOn, executableOsId } =