From 8dcd86efbd9454285301358fdc56c217e1547d5e Mon Sep 17 00:00:00 2001 From: Le Roux Bodenstein Date: Fri, 11 Jul 2025 09:55:59 +0100 Subject: [PATCH 1/3] patch the openssl included in node to ignore redhat's rh-allow-sha1-signatures config --- .../007-ignore-rh-allow-sha1-signatures.patch | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 scripts/nodejs-patches/007-ignore-rh-allow-sha1-signatures.patch diff --git a/scripts/nodejs-patches/007-ignore-rh-allow-sha1-signatures.patch b/scripts/nodejs-patches/007-ignore-rh-allow-sha1-signatures.patch new file mode 100644 index 0000000000..529bc1c370 --- /dev/null +++ b/scripts/nodejs-patches/007-ignore-rh-allow-sha1-signatures.patch @@ -0,0 +1,14 @@ +diff --git a/deps/openssl/openssl/crypto/evp/evp_cnf.c b/deps/openssl/openssl/crypto/evp/evp_cnf.c +index 0e7fe64cf9..bdba3638ee 100644 +--- a/deps/openssl/openssl/crypto/evp/evp_cnf.c ++++ b/deps/openssl/openssl/crypto/evp/evp_cnf.c +@@ -57,6 +57,9 @@ static int alg_module_init(CONF_IMODULE *md, const CONF *cnf) + ERR_raise(ERR_LIB_EVP, EVP_R_SET_DEFAULT_PROPERTY_FAILURE); + return 0; + } ++ } else if (strcmp(oval->name, "rh-allow-sha1-signatures") == 0) { ++ /* allow and then ignore this option */ ++ + } else { + ERR_raise_data(ERR_LIB_EVP, EVP_R_UNKNOWN_OPTION, + "name=%s, value=%s", oval->name, oval->value); From bd8c4773f7db6aa10ac87a63237d8c1c23b84661 Mon Sep 17 00:00:00 2001 From: Le Roux Bodenstein Date: Fri, 11 Jul 2025 10:17:07 +0100 Subject: [PATCH 2/3] add rhel9 e2e and smoke tests for ppc64le/s390x --- .evergreen.yml | 35 ++++++++++++++++++- .../e2e-tests-build-variants.js | 12 +++++++ .evergreen/evergreen.yml.in | 11 +++++- 3 files changed, 56 insertions(+), 2 deletions(-) diff --git a/.evergreen.yml b/.evergreen.yml index a238fd7295..95fa523a75 100644 --- a/.evergreen.yml +++ b/.evergreen.yml @@ -11478,6 +11478,18 @@ buildvariants: mongosh_test_e2e_force_fips: "" tasks: - name: e2e_tests_linux_ppc64le + - name: e2e_tests_rhel9_power_small + display_name: "RHEL 9 PPC (E2E tests)" + run_on: rhel9-power-small + tags: [] + expansions: + executable_os_id: "linux-ppc64le" + disable_openssl_shared_config_for_bundled_openssl: false + node_js_version: "20.19.3" + mongosh_server_test_version: "stable-enterprise" + mongosh_test_e2e_force_fips: "" + tasks: + - name: e2e_tests_linux_ppc64le - name: e2e_tests_rhel7_zseries_large_m60x display_name: "RHEL 7 s390x 60x (E2E tests)" run_on: rhel7-zseries-large @@ -11502,6 +11514,18 @@ buildvariants: mongosh_test_e2e_force_fips: "" tasks: - name: e2e_tests_linux_s390x + - name: e2e_tests_rhel9_zseries_small + display_name: "RHEL 9 s390x (E2E tests)" + run_on: rhel9-zseries-small + tags: [] + expansions: + executable_os_id: "linux-s390x" + disable_openssl_shared_config_for_bundled_openssl: false + node_js_version: "20.19.3" + mongosh_server_test_version: "stable-enterprise" + mongosh_test_e2e_force_fips: "" + tasks: + - name: e2e_tests_linux_s390x - name: e2e_tests_macos_14 display_name: "MacOS 14 x64 (E2E tests)" run_on: macos-14 @@ -11862,12 +11886,21 @@ buildvariants: run_on: rhel8-zseries-small tasks: - name: pkg_test_rpmextract_rpm_s390x + - name: pkg_smoke_tests_rhel9_s390x + display_name: "package smoke tests (RHEL 9 s390x)" + run_on: rhel9-zseries-small + tasks: + - name: pkg_test_rpmextract_rpm_s390x - name: pkg_smoke_tests_rhel8_ppc64le display_name: "package smoke tests (RHEL 8 ppc64le)" run_on: rhel8-power-small tasks: - name: pkg_test_rpmextract_rpm_ppc64le - + - name: pkg_smoke_tests_rhel9_ppc64le + display_name: "package smoke tests (RHEL 9 ppc64le)" + run_on: rhel9-power-small + tasks: + - name: pkg_test_rpmextract_rpm_ppc64le - name: draft_publish_release display_name: "Draft/Publish Release" run_on: ubuntu2004-small diff --git a/.evergreen/build-variants/e2e-tests-build-variants.js b/.evergreen/build-variants/e2e-tests-build-variants.js index 0da9a7fd62..86b4d47c4a 100644 --- a/.evergreen/build-variants/e2e-tests-build-variants.js +++ b/.evergreen/build-variants/e2e-tests-build-variants.js @@ -299,6 +299,12 @@ exports.E2E_TESTS_BUILD_VARIANTS = [ executableOsId: 'linux-ppc64le', mVersion: 'stable', }, + { + displayName: 'RHEL 9 PPC', + runOn: 'rhel9-power-small', + executableOsId: 'linux-ppc64le', + mVersion: 'stable', + }, { displayName: 'RHEL 7 s390x', runOn: 'rhel7-zseries-large', @@ -311,6 +317,12 @@ exports.E2E_TESTS_BUILD_VARIANTS = [ executableOsId: 'linux-s390x', mVersion: 'stable', }, + { + displayName: 'RHEL 9 s390x', + runOn: 'rhel9-zseries-small', + executableOsId: 'linux-s390x', + mVersion: 'stable', + }, { displayName: 'MacOS 14 x64', runOn: 'macos-14', diff --git a/.evergreen/evergreen.yml.in b/.evergreen/evergreen.yml.in index 2e8a169bd1..ed2b448bea 100644 --- a/.evergreen/evergreen.yml.in +++ b/.evergreen/evergreen.yml.in @@ -1718,12 +1718,21 @@ buildvariants: run_on: rhel8-zseries-small tasks: - name: pkg_test_rpmextract_rpm_s390x + - name: pkg_smoke_tests_rhel9_s390x + display_name: "package smoke tests (RHEL 9 s390x)" + run_on: rhel9-zseries-small + tasks: + - name: pkg_test_rpmextract_rpm_s390x - name: pkg_smoke_tests_rhel8_ppc64le display_name: "package smoke tests (RHEL 8 ppc64le)" run_on: rhel8-power-small tasks: - name: pkg_test_rpmextract_rpm_ppc64le - + - name: pkg_smoke_tests_rhel9_ppc64le + display_name: "package smoke tests (RHEL 9 ppc64le)" + run_on: rhel9-power-small + tasks: + - name: pkg_test_rpmextract_rpm_ppc64le - name: draft_publish_release display_name: "Draft/Publish Release" run_on: ubuntu2004-small From 989c5356645bc3639b27ed2904637f8279bffff2 Mon Sep 17 00:00:00 2001 From: Le Roux Bodenstein Date: Fri, 11 Jul 2025 12:23:00 +0100 Subject: [PATCH 3/3] remove disable_openssl_shared_config_for_bundled_openssl and disableOpenSslSharedConfig --- .evergreen.yml | 67 ------------------- .../e2e-tests-build-variants.d.ts | 1 - .../e2e-tests-build-variants.js | 8 --- .evergreen/evergreen.yml.in | 5 -- .evergreen/run-e2e-tests.sh | 9 --- scripts/docker/amazonlinux2023-rpm.Dockerfile | 7 -- 6 files changed, 97 deletions(-) diff --git a/.evergreen.yml b/.evergreen.yml index 95fa523a75..8653febf48 100644 --- a/.evergreen.yml +++ b/.evergreen.yml @@ -3778,7 +3778,6 @@ functions: NODE_JS_VERSION: ${node_js_version} AWS_AUTH_IAM_ACCESS_KEY_ID: ${devtools_ci_aws_key} AWS_AUTH_IAM_SECRET_ACCESS_KEY: ${devtools_ci_aws_secret} - DISABLE_OPENSSL_SHARED_CONFIG_FOR_BUNDLED_OPENSSL: ${disable_openssl_shared_config_for_bundled_openssl} TASK_NAME: ${task_name} ### @@ -4399,8 +4398,6 @@ functions: script: | set -e set -x - # fix rh-allow-sha1-signatures error, see run-e2e-tests.sh - export OPENSSL_CONF="" npx -y mongodb-runner exec -t standalone --version=7.0.x-enterprise -- \ sh -c 'MONGOSH_SMOKE_TEST_SERVER="$MONGODB_URI" ./dist/mongosh --perfTests > perf_results.json' env: @@ -5515,7 +5512,6 @@ tasks: node_js_version: ${node_js_version} mongosh_server_test_version: ${mongosh_server_test_version} mongosh_test_e2e_force_fips: ${mongosh_test_e2e_force_fips} - disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false} - name: e2e_tests_linux_x64_rhel8 tags: ["e2e-test", "assigned_to_jira_team_mongosh_mongosh"] depends_on: @@ -5534,7 +5530,6 @@ tasks: node_js_version: ${node_js_version} mongosh_server_test_version: ${mongosh_server_test_version} mongosh_test_e2e_force_fips: ${mongosh_test_e2e_force_fips} - disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false} - name: e2e_tests_linux_x64_openssl11 tags: ["e2e-test", "assigned_to_jira_team_mongosh_mongosh"] depends_on: @@ -5553,7 +5548,6 @@ tasks: node_js_version: ${node_js_version} mongosh_server_test_version: ${mongosh_server_test_version} mongosh_test_e2e_force_fips: ${mongosh_test_e2e_force_fips} - disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false} - name: e2e_tests_linux_x64_openssl11_rhel8 tags: ["e2e-test", "assigned_to_jira_team_mongosh_mongosh"] depends_on: @@ -5572,7 +5566,6 @@ tasks: node_js_version: ${node_js_version} mongosh_server_test_version: ${mongosh_server_test_version} mongosh_test_e2e_force_fips: ${mongosh_test_e2e_force_fips} - disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false} - name: e2e_tests_linux_x64_openssl3 tags: ["e2e-test", "assigned_to_jira_team_mongosh_mongosh"] depends_on: @@ -5591,7 +5584,6 @@ tasks: node_js_version: ${node_js_version} mongosh_server_test_version: ${mongosh_server_test_version} mongosh_test_e2e_force_fips: ${mongosh_test_e2e_force_fips} - disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false} - name: e2e_tests_linux_x64_openssl3_rhel8 tags: ["e2e-test", "assigned_to_jira_team_mongosh_mongosh"] depends_on: @@ -5610,7 +5602,6 @@ tasks: node_js_version: ${node_js_version} mongosh_server_test_version: ${mongosh_server_test_version} mongosh_test_e2e_force_fips: ${mongosh_test_e2e_force_fips} - disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false} - name: e2e_tests_linux_arm64 tags: ["e2e-test", "assigned_to_jira_team_mongosh_mongosh"] depends_on: @@ -5629,7 +5620,6 @@ tasks: node_js_version: ${node_js_version} mongosh_server_test_version: ${mongosh_server_test_version} mongosh_test_e2e_force_fips: ${mongosh_test_e2e_force_fips} - disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false} - name: e2e_tests_linux_arm64_openssl11 tags: ["e2e-test", "assigned_to_jira_team_mongosh_mongosh"] depends_on: @@ -5648,7 +5638,6 @@ tasks: node_js_version: ${node_js_version} mongosh_server_test_version: ${mongosh_server_test_version} mongosh_test_e2e_force_fips: ${mongosh_test_e2e_force_fips} - disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false} - name: e2e_tests_linux_arm64_openssl3 tags: ["e2e-test", "assigned_to_jira_team_mongosh_mongosh"] depends_on: @@ -5667,7 +5656,6 @@ tasks: node_js_version: ${node_js_version} mongosh_server_test_version: ${mongosh_server_test_version} mongosh_test_e2e_force_fips: ${mongosh_test_e2e_force_fips} - disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false} - name: e2e_tests_linux_ppc64le tags: ["e2e-test", "assigned_to_jira_team_mongosh_mongosh"] depends_on: @@ -5686,7 +5674,6 @@ tasks: node_js_version: ${node_js_version} mongosh_server_test_version: ${mongosh_server_test_version} mongosh_test_e2e_force_fips: ${mongosh_test_e2e_force_fips} - disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false} - name: e2e_tests_linux_s390x tags: ["e2e-test", "assigned_to_jira_team_mongosh_mongosh"] depends_on: @@ -5705,7 +5692,6 @@ tasks: node_js_version: ${node_js_version} mongosh_server_test_version: ${mongosh_server_test_version} mongosh_test_e2e_force_fips: ${mongosh_test_e2e_force_fips} - disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false} - name: e2e_tests_darwin tags: ["e2e-test", "assigned_to_jira_team_mongosh_mongosh"] depends_on: @@ -5724,7 +5710,6 @@ tasks: node_js_version: ${node_js_version} mongosh_server_test_version: ${mongosh_server_test_version} mongosh_test_e2e_force_fips: ${mongosh_test_e2e_force_fips} - disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false} - name: e2e_tests_darwin_arm64 tags: ["e2e-test", "assigned_to_jira_team_mongosh_mongosh"] depends_on: @@ -5743,7 +5728,6 @@ tasks: node_js_version: ${node_js_version} mongosh_server_test_version: ${mongosh_server_test_version} mongosh_test_e2e_force_fips: ${mongosh_test_e2e_force_fips} - disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false} - name: e2e_tests_win32 tags: ["e2e-test", "assigned_to_jira_team_mongosh_mongosh"] depends_on: @@ -5762,7 +5746,6 @@ tasks: node_js_version: ${node_js_version} mongosh_server_test_version: ${mongosh_server_test_version} mongosh_test_e2e_force_fips: ${mongosh_test_e2e_force_fips} - disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false} - name: perf_tests_linux_x64 tags: ["perf-test"] depends_on: @@ -10992,7 +10975,6 @@ buildvariants: tags: ["nightly-driver"] expansions: executable_os_id: "linux-x64" - disable_openssl_shared_config_for_bundled_openssl: false node_js_version: "20.19.3" mongosh_server_test_version: "7.0.x-enterprise" mongosh_test_e2e_force_fips: "" @@ -11004,7 +10986,6 @@ buildvariants: tags: ["nightly-driver"] expansions: executable_os_id: "linux-x64" - disable_openssl_shared_config_for_bundled_openssl: false node_js_version: "20.19.3" mongosh_server_test_version: "7.0.x-enterprise" mongosh_test_e2e_force_fips: "" @@ -11016,7 +10997,6 @@ buildvariants: tags: ["nightly-driver"] expansions: executable_os_id: "linux-x64" - disable_openssl_shared_config_for_bundled_openssl: false node_js_version: "20.19.3" mongosh_server_test_version: "stable-enterprise" mongosh_test_e2e_force_fips: "" @@ -11028,7 +11008,6 @@ buildvariants: tags: ["nightly-driver"] expansions: executable_os_id: "linux-x64" - disable_openssl_shared_config_for_bundled_openssl: true node_js_version: "20.19.3" mongosh_server_test_version: "7.0.x-enterprise" mongosh_test_e2e_force_fips: "" @@ -11040,7 +11019,6 @@ buildvariants: tags: ["nightly-driver"] expansions: executable_os_id: "linux-x64" - disable_openssl_shared_config_for_bundled_openssl: true node_js_version: "20.19.3" mongosh_server_test_version: "stable-enterprise" mongosh_test_e2e_force_fips: "" @@ -11052,7 +11030,6 @@ buildvariants: tags: ["nightly-driver"] expansions: executable_os_id: "linux-x64" - disable_openssl_shared_config_for_bundled_openssl: false node_js_version: "20.19.3" mongosh_server_test_version: "stable-enterprise" mongosh_test_e2e_force_fips: "" @@ -11064,7 +11041,6 @@ buildvariants: tags: ["nightly-driver"] expansions: executable_os_id: "linux-x64-openssl11" - disable_openssl_shared_config_for_bundled_openssl: false node_js_version: "20.19.3" mongosh_server_test_version: "stable-enterprise" mongosh_test_e2e_force_fips: "" @@ -11076,7 +11052,6 @@ buildvariants: tags: ["nightly-driver"] expansions: executable_os_id: "linux-x64-openssl11" - disable_openssl_shared_config_for_bundled_openssl: false node_js_version: "20.19.3" mongosh_server_test_version: "stable-enterprise" mongosh_test_e2e_force_fips: "1" @@ -11088,7 +11063,6 @@ buildvariants: tags: ["nightly-driver"] expansions: executable_os_id: "linux-x64" - disable_openssl_shared_config_for_bundled_openssl: false node_js_version: "20.19.3" mongosh_server_test_version: "stable-enterprise" mongosh_test_e2e_force_fips: "" @@ -11100,7 +11074,6 @@ buildvariants: tags: ["nightly-driver"] expansions: executable_os_id: "linux-x64-openssl3" - disable_openssl_shared_config_for_bundled_openssl: false node_js_version: "20.19.3" mongosh_server_test_version: "stable-enterprise" mongosh_test_e2e_force_fips: "" @@ -11112,7 +11085,6 @@ buildvariants: tags: ["nightly-driver"] expansions: executable_os_id: "linux-x64-openssl3" - disable_openssl_shared_config_for_bundled_openssl: false node_js_version: "20.19.3" mongosh_server_test_version: "stable-enterprise" mongosh_test_e2e_force_fips: "1" @@ -11124,7 +11096,6 @@ buildvariants: tags: ["nightly-driver"] expansions: executable_os_id: "linux-x64" - disable_openssl_shared_config_for_bundled_openssl: false node_js_version: "20.19.3" mongosh_server_test_version: "6.0.x-enterprise" mongosh_test_e2e_force_fips: "" @@ -11136,7 +11107,6 @@ buildvariants: tags: ["nightly-driver"] expansions: executable_os_id: "linux-x64" - disable_openssl_shared_config_for_bundled_openssl: false node_js_version: "20.19.3" mongosh_server_test_version: "stable-enterprise" mongosh_test_e2e_force_fips: "" @@ -11148,7 +11118,6 @@ buildvariants: tags: ["nightly-driver"] expansions: executable_os_id: "linux-x64-openssl11" - disable_openssl_shared_config_for_bundled_openssl: false node_js_version: "20.19.3" mongosh_server_test_version: "stable-enterprise" mongosh_test_e2e_force_fips: "" @@ -11160,7 +11129,6 @@ buildvariants: tags: ["nightly-driver"] expansions: executable_os_id: "linux-x64" - disable_openssl_shared_config_for_bundled_openssl: false node_js_version: "20.19.3" mongosh_server_test_version: "stable-enterprise" mongosh_test_e2e_force_fips: "" @@ -11172,7 +11140,6 @@ buildvariants: tags: ["nightly-driver"] expansions: executable_os_id: "linux-x64-openssl3" - disable_openssl_shared_config_for_bundled_openssl: false node_js_version: "20.19.3" mongosh_server_test_version: "stable-enterprise" mongosh_test_e2e_force_fips: "" @@ -11184,7 +11151,6 @@ buildvariants: tags: ["nightly-driver"] expansions: executable_os_id: "linux-x64" - disable_openssl_shared_config_for_bundled_openssl: false node_js_version: "20.19.3" mongosh_server_test_version: "stable-enterprise" mongosh_test_e2e_force_fips: "" @@ -11196,7 +11162,6 @@ buildvariants: tags: ["nightly-driver"] expansions: executable_os_id: "linux-x64-openssl3" - disable_openssl_shared_config_for_bundled_openssl: false node_js_version: "20.19.3" mongosh_server_test_version: "stable-enterprise" mongosh_test_e2e_force_fips: "" @@ -11208,7 +11173,6 @@ buildvariants: tags: ["nightly-driver"] expansions: executable_os_id: "linux-x64" - disable_openssl_shared_config_for_bundled_openssl: false node_js_version: "20.19.3" mongosh_server_test_version: "6.0.x-enterprise" mongosh_test_e2e_force_fips: "" @@ -11220,7 +11184,6 @@ buildvariants: tags: ["nightly-driver"] expansions: executable_os_id: "linux-x64-openssl11" - disable_openssl_shared_config_for_bundled_openssl: false node_js_version: "20.19.3" mongosh_server_test_version: "6.0.x-enterprise" mongosh_test_e2e_force_fips: "" @@ -11232,7 +11195,6 @@ buildvariants: tags: ["nightly-driver"] expansions: executable_os_id: "linux-x64" - disable_openssl_shared_config_for_bundled_openssl: false node_js_version: "20.19.3" mongosh_server_test_version: "7.0.x-enterprise" mongosh_test_e2e_force_fips: "" @@ -11244,7 +11206,6 @@ buildvariants: tags: ["nightly-driver"] expansions: executable_os_id: "linux-x64-openssl11" - disable_openssl_shared_config_for_bundled_openssl: false node_js_version: "20.19.3" mongosh_server_test_version: "7.0.x-enterprise" mongosh_test_e2e_force_fips: "" @@ -11256,7 +11217,6 @@ buildvariants: tags: ["nightly-driver"] expansions: executable_os_id: "linux-x64" - disable_openssl_shared_config_for_bundled_openssl: false node_js_version: "20.19.3" mongosh_server_test_version: "7.0.x-enterprise" mongosh_test_e2e_force_fips: "" @@ -11268,7 +11228,6 @@ buildvariants: tags: ["nightly-driver"] expansions: executable_os_id: "linux-x64" - disable_openssl_shared_config_for_bundled_openssl: true node_js_version: "20.19.3" mongosh_server_test_version: "stable-enterprise" mongosh_test_e2e_force_fips: "" @@ -11280,7 +11239,6 @@ buildvariants: tags: ["nightly-driver"] expansions: executable_os_id: "linux-x64" - disable_openssl_shared_config_for_bundled_openssl: false node_js_version: "20.19.3" mongosh_server_test_version: "7.0.x-enterprise" mongosh_test_e2e_force_fips: "" @@ -11292,7 +11250,6 @@ buildvariants: tags: ["nightly-driver"] expansions: executable_os_id: "linux-x64" - disable_openssl_shared_config_for_bundled_openssl: false node_js_version: "20.19.3" mongosh_server_test_version: "stable-enterprise" mongosh_test_e2e_force_fips: "" @@ -11304,7 +11261,6 @@ buildvariants: tags: [] expansions: executable_os_id: "linux-arm64" - disable_openssl_shared_config_for_bundled_openssl: false node_js_version: "20.19.3" mongosh_server_test_version: "6.0.x-enterprise" mongosh_test_e2e_force_fips: "" @@ -11316,7 +11272,6 @@ buildvariants: tags: [] expansions: executable_os_id: "linux-arm64" - disable_openssl_shared_config_for_bundled_openssl: false node_js_version: "20.19.3" mongosh_server_test_version: "stable-enterprise" mongosh_test_e2e_force_fips: "" @@ -11328,7 +11283,6 @@ buildvariants: tags: [] expansions: executable_os_id: "linux-arm64-openssl11" - disable_openssl_shared_config_for_bundled_openssl: false node_js_version: "20.19.3" mongosh_server_test_version: "stable-enterprise" mongosh_test_e2e_force_fips: "" @@ -11340,7 +11294,6 @@ buildvariants: tags: [] expansions: executable_os_id: "linux-arm64" - disable_openssl_shared_config_for_bundled_openssl: false node_js_version: "20.19.3" mongosh_server_test_version: "stable-enterprise" mongosh_test_e2e_force_fips: "" @@ -11352,7 +11305,6 @@ buildvariants: tags: [] expansions: executable_os_id: "linux-arm64-openssl3" - disable_openssl_shared_config_for_bundled_openssl: false node_js_version: "20.19.3" mongosh_server_test_version: "stable-enterprise" mongosh_test_e2e_force_fips: "" @@ -11364,7 +11316,6 @@ buildvariants: tags: [] expansions: executable_os_id: "linux-arm64" - disable_openssl_shared_config_for_bundled_openssl: false node_js_version: "20.19.3" mongosh_server_test_version: "stable-enterprise" mongosh_test_e2e_force_fips: "" @@ -11376,7 +11327,6 @@ buildvariants: tags: [] expansions: executable_os_id: "linux-arm64-openssl3" - disable_openssl_shared_config_for_bundled_openssl: false node_js_version: "20.19.3" mongosh_server_test_version: "stable-enterprise" mongosh_test_e2e_force_fips: "" @@ -11388,7 +11338,6 @@ buildvariants: tags: [] expansions: executable_os_id: "linux-arm64" - disable_openssl_shared_config_for_bundled_openssl: false node_js_version: "20.19.3" mongosh_server_test_version: "7.0.x-enterprise" mongosh_test_e2e_force_fips: "" @@ -11400,7 +11349,6 @@ buildvariants: tags: [] expansions: executable_os_id: "linux-arm64" - disable_openssl_shared_config_for_bundled_openssl: true node_js_version: "20.19.3" mongosh_server_test_version: "stable-enterprise" mongosh_test_e2e_force_fips: "" @@ -11412,7 +11360,6 @@ buildvariants: tags: [] expansions: executable_os_id: "linux-arm64" - disable_openssl_shared_config_for_bundled_openssl: false node_js_version: "20.19.3" mongosh_server_test_version: "stable-enterprise" mongosh_test_e2e_force_fips: "" @@ -11424,7 +11371,6 @@ buildvariants: tags: [] expansions: executable_os_id: "linux-arm64" - disable_openssl_shared_config_for_bundled_openssl: true node_js_version: "20.19.3" mongosh_server_test_version: "7.0.x-enterprise" mongosh_test_e2e_force_fips: "" @@ -11436,7 +11382,6 @@ buildvariants: tags: [] expansions: executable_os_id: "linux-arm64-openssl3" - disable_openssl_shared_config_for_bundled_openssl: true node_js_version: "20.19.3" mongosh_server_test_version: "7.0.x-enterprise" mongosh_test_e2e_force_fips: "" @@ -11448,7 +11393,6 @@ buildvariants: tags: [] expansions: executable_os_id: "linux-arm64" - disable_openssl_shared_config_for_bundled_openssl: true node_js_version: "20.19.3" mongosh_server_test_version: "stable-enterprise" mongosh_test_e2e_force_fips: "" @@ -11460,7 +11404,6 @@ buildvariants: tags: [] expansions: executable_os_id: "linux-arm64-openssl3" - disable_openssl_shared_config_for_bundled_openssl: true node_js_version: "20.19.3" mongosh_server_test_version: "stable-enterprise" mongosh_test_e2e_force_fips: "" @@ -11472,7 +11415,6 @@ buildvariants: tags: [] expansions: executable_os_id: "linux-ppc64le" - disable_openssl_shared_config_for_bundled_openssl: false node_js_version: "20.19.3" mongosh_server_test_version: "stable-enterprise" mongosh_test_e2e_force_fips: "" @@ -11484,7 +11426,6 @@ buildvariants: tags: [] expansions: executable_os_id: "linux-ppc64le" - disable_openssl_shared_config_for_bundled_openssl: false node_js_version: "20.19.3" mongosh_server_test_version: "stable-enterprise" mongosh_test_e2e_force_fips: "" @@ -11496,7 +11437,6 @@ buildvariants: tags: [] expansions: executable_os_id: "linux-s390x" - disable_openssl_shared_config_for_bundled_openssl: false node_js_version: "20.19.3" mongosh_server_test_version: "6.0.x-enterprise" mongosh_test_e2e_force_fips: "" @@ -11508,7 +11448,6 @@ buildvariants: tags: [] expansions: executable_os_id: "linux-s390x" - disable_openssl_shared_config_for_bundled_openssl: false node_js_version: "20.19.3" mongosh_server_test_version: "stable-enterprise" mongosh_test_e2e_force_fips: "" @@ -11520,7 +11459,6 @@ buildvariants: tags: [] expansions: executable_os_id: "linux-s390x" - disable_openssl_shared_config_for_bundled_openssl: false node_js_version: "20.19.3" mongosh_server_test_version: "stable-enterprise" mongosh_test_e2e_force_fips: "" @@ -11532,7 +11470,6 @@ buildvariants: tags: [] expansions: executable_os_id: "darwin-x64" - disable_openssl_shared_config_for_bundled_openssl: false node_js_version: "20.19.3" mongosh_server_test_version: "stable-enterprise" mongosh_test_e2e_force_fips: "" @@ -11544,7 +11481,6 @@ buildvariants: tags: [] expansions: executable_os_id: "darwin-arm64" - disable_openssl_shared_config_for_bundled_openssl: false node_js_version: "20.19.3" mongosh_server_test_version: "stable-enterprise" mongosh_test_e2e_force_fips: "" @@ -11556,7 +11492,6 @@ buildvariants: tags: [] expansions: executable_os_id: "darwin-x64" - disable_openssl_shared_config_for_bundled_openssl: false node_js_version: "20.19.3" mongosh_server_test_version: "8.0.5-enterprise" mongosh_test_e2e_force_fips: "" @@ -11568,7 +11503,6 @@ buildvariants: tags: [] expansions: executable_os_id: "darwin-arm64" - disable_openssl_shared_config_for_bundled_openssl: false node_js_version: "20.19.3" mongosh_server_test_version: "8.0.5-enterprise" mongosh_test_e2e_force_fips: "" @@ -11584,7 +11518,6 @@ buildvariants: tags: [] expansions: executable_os_id: "win32" - disable_openssl_shared_config_for_bundled_openssl: false node_js_version: "20.19.3" mongosh_server_test_version: "stable-enterprise" mongosh_test_e2e_force_fips: "" diff --git a/.evergreen/build-variants/e2e-tests-build-variants.d.ts b/.evergreen/build-variants/e2e-tests-build-variants.d.ts index 59b215bc5f..28358a6530 100644 --- a/.evergreen/build-variants/e2e-tests-build-variants.d.ts +++ b/.evergreen/build-variants/e2e-tests-build-variants.d.ts @@ -6,7 +6,6 @@ export type E2ETestsBuildVariant = { executableOsId: string; mVersion: string; tags?: string[]; - disableOpenSslSharedConfig?: boolean; fips?: boolean; additionalTasks?: string[]; }; diff --git a/.evergreen/build-variants/e2e-tests-build-variants.js b/.evergreen/build-variants/e2e-tests-build-variants.js index 86b4d47c4a..ac4c80ce25 100644 --- a/.evergreen/build-variants/e2e-tests-build-variants.js +++ b/.evergreen/build-variants/e2e-tests-build-variants.js @@ -28,7 +28,6 @@ exports.E2E_TESTS_BUILD_VARIANTS = [ displayName: 'RHEL 9.0 x64', runOn: 'rhel90-small', tags: ['nightly-driver'], - disableOpenSslSharedConfig: true, executableOsId: 'linux-x64', mVersion: '7.0.x', }, @@ -36,7 +35,6 @@ exports.E2E_TESTS_BUILD_VARIANTS = [ displayName: 'RHEL 9.3 x64', runOn: 'rhel93-small', tags: ['nightly-driver'], - disableOpenSslSharedConfig: true, executableOsId: 'linux-x64', mVersion: 'stable', }, @@ -181,7 +179,6 @@ exports.E2E_TESTS_BUILD_VARIANTS = [ displayName: 'Amazon Linux 2023 x64', runOn: 'amazon2023.0-small', tags: ['nightly-driver'], - disableOpenSslSharedConfig: true, executableOsId: 'linux-x64', mVersion: 'stable', }, @@ -253,7 +250,6 @@ exports.E2E_TESTS_BUILD_VARIANTS = [ { displayName: 'Amazon Linux 2023 arm64', runOn: 'amazon2023.0-arm64-small', - disableOpenSslSharedConfig: true, executableOsId: 'linux-arm64', mVersion: 'stable', }, @@ -266,14 +262,12 @@ exports.E2E_TESTS_BUILD_VARIANTS = [ { displayName: 'RHEL 9.0 arm64', runOn: 'rhel90-arm64-small', - disableOpenSslSharedConfig: true, executableOsId: 'linux-arm64', mVersion: '7.0.x', }, { displayName: 'RHEL 9.0 arm64', runOn: 'rhel90-arm64-small', - disableOpenSslSharedConfig: true, sharedOpenSsl: 'openssl3', executableOsId: 'linux-arm64-openssl3', mVersion: '7.0.x', @@ -281,14 +275,12 @@ exports.E2E_TESTS_BUILD_VARIANTS = [ { displayName: 'RHEL 9.3 arm64', runOn: 'rhel93-arm64-small', - disableOpenSslSharedConfig: true, executableOsId: 'linux-arm64', mVersion: 'stable', }, { displayName: 'RHEL 9.3 arm64', runOn: 'rhel93-arm64-small', - disableOpenSslSharedConfig: true, sharedOpenSsl: 'openssl3', executableOsId: 'linux-arm64-openssl3', mVersion: 'stable', diff --git a/.evergreen/evergreen.yml.in b/.evergreen/evergreen.yml.in index ed2b448bea..d39c1bbba2 100644 --- a/.evergreen/evergreen.yml.in +++ b/.evergreen/evergreen.yml.in @@ -487,7 +487,6 @@ functions: NODE_JS_VERSION: ${node_js_version} AWS_AUTH_IAM_ACCESS_KEY_ID: ${devtools_ci_aws_key} AWS_AUTH_IAM_SECRET_ACCESS_KEY: ${devtools_ci_aws_secret} - DISABLE_OPENSSL_SHARED_CONFIG_FOR_BUNDLED_OPENSSL: ${disable_openssl_shared_config_for_bundled_openssl} TASK_NAME: ${task_name} ### @@ -1044,8 +1043,6 @@ functions: script: | set -e set -x - # fix rh-allow-sha1-signatures error, see run-e2e-tests.sh - export OPENSSL_CONF="" npx -y mongodb-runner exec -t standalone --version=7.0.x-enterprise -- \ sh -c 'MONGOSH_SMOKE_TEST_SERVER="$MONGODB_URI" ./dist/mongosh --perfTests > perf_results.json' env: @@ -1241,7 +1238,6 @@ tasks: node_js_version: ${node_js_version} mongosh_server_test_version: ${mongosh_server_test_version} mongosh_test_e2e_force_fips: ${mongosh_test_e2e_force_fips} - disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false} <% } %> - name: perf_tests_linux_x64 tags: ["perf-test"] @@ -1550,7 +1546,6 @@ buildvariants: tags: <% out([...(variant.tags ?? [])]) %> expansions: executable_os_id: "<% out(variant.executableOsId) %>" - 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' : '') %>" diff --git a/.evergreen/run-e2e-tests.sh b/.evergreen/run-e2e-tests.sh index 116815d0d0..38d494822c 100755 --- a/.evergreen/run-e2e-tests.sh +++ b/.evergreen/run-e2e-tests.sh @@ -3,15 +3,6 @@ set -e export NODE_JS_VERSION=${NODE_JS_VERSION} export TASK_NAME=${TASK_NAME} -if [[ "$DISABLE_OPENSSL_SHARED_CONFIG_FOR_BUNDLED_OPENSSL" == "true" ]] && [[ ! "$TASK_NAME" =~ openssl(3|11) ]]; then - # On RHEL9 and based-distros, an additional configuration option - # `rh-allow-sha1-signatures` is present which is not recognizable to the - # OpenSSL version bundled with Node.js and hence the mongosh binary fails to - # run. Explicitly on those hosts we disable effect of --openssl-shared-config - # flag which is pushed by boxednode when bundling Node.js - export OPENSSL_CONF="" -fi - source .evergreen/setup-env.sh dist/mongosh --version diff --git a/scripts/docker/amazonlinux2023-rpm.Dockerfile b/scripts/docker/amazonlinux2023-rpm.Dockerfile index 0fc73a923e..9c9c4e1159 100644 --- a/scripts/docker/amazonlinux2023-rpm.Dockerfile +++ b/scripts/docker/amazonlinux2023-rpm.Dockerfile @@ -1,12 +1,5 @@ FROM amazonlinux:2023 -# On RHEL9 and based-distros, an additional configuration option - # `rh-allow-sha1-signatures` is present which is not recognizable to the - # OpenSSL version bundled with Node.js and hence the mongosh binary fails to - # run. Explicitly on those hosts we disable effect of --openssl-shared-config - # flag which is pushed by boxednode when bundling Node.js -ENV OPENSSL_CONF="" - ARG artifact_url="" ADD ${artifact_url} /tmp ADD node_modules /usr/share/mongodb-crypt-library-version/node_modules