From e394c308b2e423d62a51b0990fd5a3ac122275f1 Mon Sep 17 00:00:00 2001 From: gagik Date: Mon, 16 Dec 2024 13:26:40 +0100 Subject: [PATCH] fix openssl versioning --- .evergreen.yml | 56 ++++++++++++++++++------------------- .evergreen/evergreen.yml.in | 46 +++++++++++++++--------------- 2 files changed, 51 insertions(+), 51 deletions(-) diff --git a/.evergreen.yml b/.evergreen.yml index 45b661bb4..a839a8226 100644 --- a/.evergreen.yml +++ b/.evergreen.yml @@ -14779,25 +14779,25 @@ buildvariants: run_on: rhel83-fips tags: ["nightly-driver"] expansions: - executable_os_id: "linux-x64" + executable_os_id: "linux-x64-openssl11" disable_openssl_shared_config_for_bundled_openssl: false node_js_version: "20.18.1" mongosh_server_test_version: "stable-enterprise" mongosh_test_e2e_force_fips: "" tasks: - - name: e2e_tests_linux_x64 + - name: e2e_tests_linux_x64_openssl11 - name: e2e_tests_rhel83_fips_openssl11_true display_name: "RHEL 8.3 x64 openssl11 FIPS (E2E tests)" run_on: rhel83-fips tags: ["nightly-driver"] expansions: - executable_os_id: "linux-x64" + executable_os_id: "linux-x64-openssl11" disable_openssl_shared_config_for_bundled_openssl: false node_js_version: "20.18.1" mongosh_server_test_version: "stable-enterprise" mongosh_test_e2e_force_fips: "1" tasks: - - name: e2e_tests_linux_x64 + - name: e2e_tests_linux_x64_openssl11 - name: e2e_tests_rhel93_fips display_name: "RHEL 9.3 x64 (E2E tests)" run_on: rhel93-fips @@ -14815,25 +14815,25 @@ buildvariants: run_on: rhel93-fips tags: ["nightly-driver"] expansions: - executable_os_id: "linux-x64" + executable_os_id: "linux-x64-openssl3" disable_openssl_shared_config_for_bundled_openssl: false node_js_version: "20.18.1" mongosh_server_test_version: "stable-enterprise" mongosh_test_e2e_force_fips: "" tasks: - - name: e2e_tests_linux_x64 + - name: e2e_tests_linux_x64_openssl3 - name: e2e_tests_rhel93_fips_openssl3_true display_name: "RHEL 9.3 x64 openssl3 FIPS (E2E tests)" run_on: rhel93-fips tags: ["nightly-driver"] expansions: - executable_os_id: "linux-x64" + executable_os_id: "linux-x64-openssl3" disable_openssl_shared_config_for_bundled_openssl: false node_js_version: "20.18.1" mongosh_server_test_version: "stable-enterprise" mongosh_test_e2e_force_fips: "1" tasks: - - name: e2e_tests_linux_x64 + - name: e2e_tests_linux_x64_openssl3 - name: e2e_tests_ubuntu1804_large_m60x display_name: "Ubuntu 18.04 x64 60x (E2E tests)" run_on: ubuntu1804-large @@ -14863,13 +14863,13 @@ buildvariants: run_on: ubuntu2004-small tags: ["nightly-driver"] expansions: - executable_os_id: "linux-x64" + executable_os_id: "linux-x64-openssl11" disable_openssl_shared_config_for_bundled_openssl: false node_js_version: "20.18.1" mongosh_server_test_version: "stable-enterprise" mongosh_test_e2e_force_fips: "" tasks: - - name: e2e_tests_linux_x64 + - name: e2e_tests_linux_x64_openssl11 - name: e2e_tests_ubuntu2204_small display_name: "Ubuntu 22.04 x64 (E2E tests)" run_on: ubuntu2204-small @@ -14887,13 +14887,13 @@ buildvariants: run_on: ubuntu2204-small tags: ["nightly-driver"] expansions: - executable_os_id: "linux-x64" + executable_os_id: "linux-x64-openssl3" disable_openssl_shared_config_for_bundled_openssl: false node_js_version: "20.18.1" mongosh_server_test_version: "stable-enterprise" mongosh_test_e2e_force_fips: "" tasks: - - name: e2e_tests_linux_x64 + - name: e2e_tests_linux_x64_openssl3 - name: e2e_tests_ubuntu2404_small display_name: "Ubuntu 24.04 x64 (E2E tests)" run_on: ubuntu2404-small @@ -14911,13 +14911,13 @@ buildvariants: run_on: ubuntu2404-small tags: ["nightly-driver"] expansions: - executable_os_id: "linux-x64" + executable_os_id: "linux-x64-openssl3" disable_openssl_shared_config_for_bundled_openssl: false node_js_version: "20.18.1" mongosh_server_test_version: "stable-enterprise" mongosh_test_e2e_force_fips: "" tasks: - - name: e2e_tests_linux_x64 + - name: e2e_tests_linux_x64_openssl3 - name: e2e_tests_debian10_small_m60x display_name: "Debian 10 x64 60x (E2E tests)" run_on: debian10-small @@ -14935,13 +14935,13 @@ buildvariants: run_on: debian10-small tags: ["nightly-driver"] expansions: - executable_os_id: "linux-x64" + executable_os_id: "linux-x64-openssl11" disable_openssl_shared_config_for_bundled_openssl: false node_js_version: "20.18.1" mongosh_server_test_version: "6.0.x-enterprise" mongosh_test_e2e_force_fips: "" tasks: - - name: e2e_tests_linux_x64 + - name: e2e_tests_linux_x64_openssl11 - name: e2e_tests_debian11_small_m70x display_name: "Debian 11 x64 70x (E2E tests)" run_on: debian11-small @@ -14959,13 +14959,13 @@ buildvariants: run_on: debian11-small tags: ["nightly-driver"] expansions: - executable_os_id: "linux-x64" + executable_os_id: "linux-x64-openssl11" disable_openssl_shared_config_for_bundled_openssl: false node_js_version: "20.18.1" mongosh_server_test_version: "7.0.x-enterprise" mongosh_test_e2e_force_fips: "" tasks: - - name: e2e_tests_linux_x64 + - name: e2e_tests_linux_x64_openssl11 - name: e2e_tests_amazon2_large_m70x display_name: "Amazon Linux 2 x64 70x (E2E tests)" run_on: amazon2-large @@ -15043,13 +15043,13 @@ buildvariants: run_on: ubuntu2004-arm64-small tags: [] expansions: - executable_os_id: "linux-arm64" + executable_os_id: "linux-arm64-openssl11" disable_openssl_shared_config_for_bundled_openssl: false node_js_version: "20.18.1" mongosh_server_test_version: "stable-enterprise" mongosh_test_e2e_force_fips: "" tasks: - - name: e2e_tests_linux_arm64 + - name: e2e_tests_linux_arm64_openssl11 - name: e2e_tests_ubuntu2204_arm64_small display_name: "Ubuntu 22.04 arm64 (E2E tests)" run_on: ubuntu2204-arm64-small @@ -15067,13 +15067,13 @@ buildvariants: run_on: ubuntu2204-arm64-small tags: [] expansions: - executable_os_id: "linux-arm64" + executable_os_id: "linux-arm64-openssl3" disable_openssl_shared_config_for_bundled_openssl: false node_js_version: "20.18.1" mongosh_server_test_version: "stable-enterprise" mongosh_test_e2e_force_fips: "" tasks: - - name: e2e_tests_linux_arm64 + - name: e2e_tests_linux_arm64_openssl3 - name: e2e_tests_ubuntu2404_arm64_small display_name: "Ubuntu 24.04 arm64 (E2E tests)" run_on: ubuntu2404-arm64-small @@ -15091,13 +15091,13 @@ buildvariants: run_on: ubuntu2404-arm64-small tags: [] expansions: - executable_os_id: "linux-arm64" + executable_os_id: "linux-arm64-openssl3" disable_openssl_shared_config_for_bundled_openssl: false node_js_version: "20.18.1" mongosh_server_test_version: "stable-enterprise" mongosh_test_e2e_force_fips: "" tasks: - - name: e2e_tests_linux_arm64 + - name: e2e_tests_linux_arm64_openssl3 - name: e2e_tests_amazon2_arm64_large_m70x display_name: "Amazon Linux 2 arm64 70x (E2E tests)" run_on: amazon2-arm64-large @@ -15151,13 +15151,13 @@ buildvariants: run_on: rhel90-arm64-small tags: [] expansions: - executable_os_id: "linux-arm64" + executable_os_id: "linux-arm64-openssl3" disable_openssl_shared_config_for_bundled_openssl: true node_js_version: "20.18.1" mongosh_server_test_version: "7.0.x-enterprise" mongosh_test_e2e_force_fips: "" tasks: - - name: e2e_tests_linux_arm64 + - name: e2e_tests_linux_arm64_openssl3 - name: e2e_tests_rhel93_arm64_small display_name: "RHEL 9.3 arm64 (E2E tests)" run_on: rhel93-arm64-small @@ -15175,13 +15175,13 @@ buildvariants: run_on: rhel93-arm64-small tags: [] expansions: - executable_os_id: "linux-arm64" + executable_os_id: "linux-arm64-openssl3" disable_openssl_shared_config_for_bundled_openssl: true node_js_version: "20.18.1" mongosh_server_test_version: "stable-enterprise" mongosh_test_e2e_force_fips: "" tasks: - - name: e2e_tests_linux_arm64 + - name: e2e_tests_linux_arm64_openssl3 - name: e2e_tests_rhel8_power_small display_name: "RHEL 8 PPC (E2E tests)" run_on: rhel8-power-small diff --git a/.evergreen/evergreen.yml.in b/.evergreen/evergreen.yml.in index b0bf5160d..e85188fc6 100644 --- a/.evergreen/evergreen.yml.in +++ b/.evergreen/evergreen.yml.in @@ -224,7 +224,7 @@ const ALL_E2E_TEST_BUILD_VARIANTS = [ tags: [ "nightly-driver" ], - disabledOpenSslSharedConfig: true, + disableOpenSslSharedConfig: true, executableOsId: "linux-x64", mVersion: "7.0.x" }, @@ -234,7 +234,7 @@ const ALL_E2E_TEST_BUILD_VARIANTS = [ tags: [ "nightly-driver" ], - disabledOpenSslSharedConfig: true, + disableOpenSslSharedConfig: true, executableOsId: "linux-x64", mVersion: "stable" }, @@ -254,7 +254,7 @@ const ALL_E2E_TEST_BUILD_VARIANTS = [ "nightly-driver" ], sharedOpenSsl: "openssl11", - executableOsId: "linux-x64", + executableOsId: "linux-x64-openssl11", mVersion: "stable" }, { @@ -265,7 +265,7 @@ const ALL_E2E_TEST_BUILD_VARIANTS = [ ], fips: true, sharedOpenSsl: "openssl11", - executableOsId: "linux-x64", + executableOsId: "linux-x64-openssl11", mVersion: "stable" }, { @@ -284,7 +284,7 @@ const ALL_E2E_TEST_BUILD_VARIANTS = [ "nightly-driver" ], sharedOpenSsl: "openssl3", - executableOsId: "linux-x64", + executableOsId: "linux-x64-openssl3", mVersion: "stable" }, { @@ -295,7 +295,7 @@ const ALL_E2E_TEST_BUILD_VARIANTS = [ ], fips: true, sharedOpenSsl: "openssl3", - executableOsId: "linux-x64", + executableOsId: "linux-x64-openssl3", mVersion: "stable" }, { @@ -323,7 +323,7 @@ const ALL_E2E_TEST_BUILD_VARIANTS = [ "nightly-driver" ], sharedOpenSsl: "openssl11", - executableOsId: "linux-x64", + executableOsId: "linux-x64-openssl11", mVersion: "stable" }, { @@ -342,7 +342,7 @@ const ALL_E2E_TEST_BUILD_VARIANTS = [ "nightly-driver" ], sharedOpenSsl: "openssl3", - executableOsId: "linux-x64", + executableOsId: "linux-x64-openssl3", mVersion: "stable" }, { @@ -361,7 +361,7 @@ const ALL_E2E_TEST_BUILD_VARIANTS = [ "nightly-driver" ], sharedOpenSsl: "openssl3", - executableOsId: "linux-x64", + executableOsId: "linux-x64-openssl3", mVersion: "stable" }, { @@ -380,7 +380,7 @@ const ALL_E2E_TEST_BUILD_VARIANTS = [ "nightly-driver" ], sharedOpenSsl: "openssl11", - executableOsId: "linux-x64", + executableOsId: "linux-x64-openssl11", mVersion: "6.0.x" }, { @@ -399,7 +399,7 @@ const ALL_E2E_TEST_BUILD_VARIANTS = [ "nightly-driver" ], sharedOpenSsl: "openssl11", - executableOsId: "linux-x64", + executableOsId: "linux-x64-openssl11", mVersion: "7.0.x" }, { @@ -417,7 +417,7 @@ const ALL_E2E_TEST_BUILD_VARIANTS = [ tags: [ "nightly-driver" ], - disabledOpenSslSharedConfig: true, + disableOpenSslSharedConfig: true, executableOsId: "linux-x64", mVersion: "stable" }, @@ -455,7 +455,7 @@ const ALL_E2E_TEST_BUILD_VARIANTS = [ displayName: "Ubuntu 20.04 arm64", runOn: "ubuntu2004-arm64-small", sharedOpenSsl: "openssl11", - executableOsId: "linux-arm64", + executableOsId: "linux-arm64-openssl11", mVersion: "stable" }, { @@ -468,7 +468,7 @@ const ALL_E2E_TEST_BUILD_VARIANTS = [ displayName: "Ubuntu 22.04 arm64", runOn: "ubuntu2204-arm64-small", sharedOpenSsl: "openssl3", - executableOsId: "linux-arm64", + executableOsId: "linux-arm64-openssl3", mVersion: "stable" }, { @@ -481,7 +481,7 @@ const ALL_E2E_TEST_BUILD_VARIANTS = [ displayName: "Ubuntu 24.04 arm64", runOn: "ubuntu2404-arm64-small", sharedOpenSsl: "openssl3", - executableOsId: "linux-arm64", + executableOsId: "linux-arm64-openssl3", mVersion: "stable" }, { @@ -493,7 +493,7 @@ const ALL_E2E_TEST_BUILD_VARIANTS = [ { displayName: "Amazon Linux 2023 arm64", runOn: "amazon2023.0-arm64-small", - disabledOpenSslSharedConfig: true, + disableOpenSslSharedConfig: true, executableOsId: "linux-arm64", mVersion: "stable" }, @@ -506,31 +506,31 @@ const ALL_E2E_TEST_BUILD_VARIANTS = [ { displayName: "RHEL 9.0 arm64", runOn: "rhel90-arm64-small", - disabledOpenSslSharedConfig: true, + disableOpenSslSharedConfig: true, executableOsId: "linux-arm64", mVersion: "7.0.x" }, { displayName: "RHEL 9.0 arm64", runOn: "rhel90-arm64-small", - disabledOpenSslSharedConfig: true, + disableOpenSslSharedConfig: true, sharedOpenSsl: "openssl3", - executableOsId: "linux-arm64", + executableOsId: "linux-arm64-openssl3", mVersion: "7.0.x" }, { displayName: "RHEL 9.3 arm64", runOn: "rhel93-arm64-small", - disabledOpenSslSharedConfig: true, + disableOpenSslSharedConfig: true, executableOsId: "linux-arm64", mVersion: "stable" }, { displayName: "RHEL 9.3 arm64", runOn: "rhel93-arm64-small", - disabledOpenSslSharedConfig: true, + disableOpenSslSharedConfig: true, sharedOpenSsl: "openssl3", - executableOsId: "linux-arm64", + executableOsId: "linux-arm64-openssl3", mVersion: "stable" }, { @@ -2082,7 +2082,7 @@ buildvariants: tags: <% out([...(variant.tags ?? [])]) %> expansions: executable_os_id: "<% out(variant.executableOsId || '') %>" - disable_openssl_shared_config_for_bundled_openssl: <% out(variant.disabledOpenSslSharedConfig || false) %> + disable_openssl_shared_config_for_bundled_openssl: <% out(variant.disableOpenSslSharedConfig || false) %> node_js_version: "<% out(NODE_JS_VERSION_20) %>" mongosh_server_test_version: "<% out(variant.mVersion) %>-enterprise" mongosh_test_e2e_force_fips: "<% out(variant.fips ? '1' : '') %>"