From b1e571675e28f72ddec256c27a7d4216e44dc911 Mon Sep 17 00:00:00 2001 From: gagik Date: Thu, 12 Dec 2024 14:05:16 +0100 Subject: [PATCH] update to use same compile_artifact --- .evergreen.yml | 421 +++++++++++++-------- .evergreen/evergreen.yml.in | 715 +++++++++++++++++++++--------------- 2 files changed, 686 insertions(+), 450 deletions(-) diff --git a/.evergreen.yml b/.evergreen.yml index f326dcd14..1f4159e3e 100644 --- a/.evergreen.yml +++ b/.evergreen.yml @@ -8278,6 +8278,7 @@ tasks: ### # E2E TESTS ### + # Some tests reuse the same compilation build variant, so we create those variations of tasks to set those dependencies. - name: e2e_tests tags: ["e2e-test"] depends_on: @@ -8309,7 +8310,139 @@ tasks: vars: executable_os_id: ${executable_os_id} - func: run_perf_tests - + - name: e2e_tests_build_linux_x64 + tags: ["e2e-test"] + depends_on: + - name: compile_artifact + variant: build_linux_x64 + commands: + - func: checkout + - func: install + vars: + node_js_version: ${node_js_version} + - func: download_compiled_artifact + vars: + executable_os_id: ${executable_os_id} + - func: run_e2e_tests + vars: + 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_build_linux_x64 + tags: ["perf-test"] + depends_on: + - name: compile_artifact + variant: build_linux_x64 + commands: + - func: checkout + - func: install + vars: + node_js_version: "20.18.1" + - func: download_compiled_artifact + vars: + executable_os_id: ${executable_os_id} + - func: run_perf_tests + - name: e2e_tests_darwin + tags: ["e2e-test"] + depends_on: + - name: compile_artifact + variant: darwin + commands: + - func: checkout + - func: install + vars: + node_js_version: ${node_js_version} + - func: download_compiled_artifact + vars: + executable_os_id: ${executable_os_id} + - func: run_e2e_tests + vars: + 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_darwin + tags: ["perf-test"] + depends_on: + - name: compile_artifact + variant: darwin + commands: + - func: checkout + - func: install + vars: + node_js_version: "20.18.1" + - func: download_compiled_artifact + vars: + executable_os_id: ${executable_os_id} + - func: run_perf_tests + - name: e2e_tests_darwin_arm64 + tags: ["e2e-test"] + depends_on: + - name: compile_artifact + variant: darwin_arm64 + commands: + - func: checkout + - func: install + vars: + node_js_version: ${node_js_version} + - func: download_compiled_artifact + vars: + executable_os_id: ${executable_os_id} + - func: run_e2e_tests + vars: + 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_darwin_arm64 + tags: ["perf-test"] + depends_on: + - name: compile_artifact + variant: darwin_arm64 + commands: + - func: checkout + - func: install + vars: + node_js_version: "20.18.1" + - func: download_compiled_artifact + vars: + executable_os_id: ${executable_os_id} + - func: run_perf_tests + - name: e2e_tests_build_win32 + tags: ["e2e-test"] + depends_on: + - name: compile_artifact + variant: build_win32 + commands: + - func: checkout + - func: install + vars: + node_js_version: ${node_js_version} + - func: download_compiled_artifact + vars: + executable_os_id: ${executable_os_id} + - func: run_e2e_tests + vars: + 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_build_win32 + tags: ["perf-test"] + depends_on: + - name: compile_artifact + variant: build_win32 + commands: + - func: checkout + - func: install + vars: + node_js_version: "20.18.1" + - func: download_compiled_artifact + vars: + executable_os_id: ${executable_os_id} + - func: run_perf_tests + ### # EXECUTABLE CONNECTIVITY TESTS ### @@ -14507,7 +14640,7 @@ buildvariants: - name: test_snippet_manager - name: test_types - name: build_linux_x64 - display_name: "RHEL 7.0 x64 (build)" + display_name: "RHEL 7.0 x64 (Build)" run_on: rhel70-build tags: [] expansions: @@ -14519,7 +14652,7 @@ buildvariants: tasks: - name: compile_artifact - name: build_linux_x64_rhel8 - display_name: "RHEL 8.0 x64 (build)" + display_name: "RHEL 8.0 x64 (Build)" run_on: rhel80-build tags: [] expansions: @@ -14531,7 +14664,7 @@ buildvariants: tasks: - name: compile_artifact - name: build_linux_x64_openssl11 - display_name: "RHEL 7.0 x64 openssl11 (build)" + display_name: "RHEL 7.0 x64 openssl11 (Build)" run_on: rhel70-build tags: [] expansions: @@ -14542,8 +14675,8 @@ buildvariants: mongosh_test_e2e_force_fips: "" tasks: - name: compile_artifact - - name: build_linux_x64_build_rhel8_openssl11 - display_name: "RHEL 8.0 x64 openssl11 (build)" + - name: build_linux_x64_openssl11_rhel8 + display_name: "RHEL 8.0 x64 openssl11 (Build)" run_on: rhel80-build tags: [] expansions: @@ -14555,7 +14688,7 @@ buildvariants: tasks: - name: compile_artifact - name: build_linux_x64_openssl3 - display_name: "RHEL 7.0 x64 openssl3 (build)" + display_name: "RHEL 7.0 x64 openssl3 (Build)" run_on: rhel70-build tags: [] expansions: @@ -14567,7 +14700,7 @@ buildvariants: tasks: - name: compile_artifact - name: build_linux_x64_openssl3_rhel8 - display_name: "RHEL 8.0 x64 openssl3 (build)" + display_name: "RHEL 8.0 x64 openssl3 (Build)" run_on: rhel80-build tags: [] expansions: @@ -14579,7 +14712,7 @@ buildvariants: tasks: - name: compile_artifact - name: build_linux_arm64 - display_name: "Amazon 2 arm64 (build)" + display_name: "Amazon 2 arm64 (Build)" run_on: amazon2-arm64-large tags: [] expansions: @@ -14591,7 +14724,7 @@ buildvariants: tasks: - name: compile_artifact - name: build_linux_arm64_openssl11 - display_name: "Amazon 2 arm64 openssl11 (build)" + display_name: "Amazon 2 arm64 openssl11 (Build)" run_on: amazon2-arm64-large tags: [] expansions: @@ -14603,7 +14736,7 @@ buildvariants: tasks: - name: compile_artifact - name: build_linux_arm64_openssl3 - display_name: "Amazon 2 arm64 openssl3 (build)" + display_name: "Amazon 2 arm64 openssl3 (Build)" run_on: amazon2-arm64-large tags: [] expansions: @@ -14615,7 +14748,7 @@ buildvariants: tasks: - name: compile_artifact - name: build_linux_ppc64le - display_name: "RHEL 8 PPC (build)" + display_name: "RHEL 8 PPC (Build)" run_on: rhel8-power-small tags: [] expansions: @@ -14627,7 +14760,7 @@ buildvariants: tasks: - name: compile_artifact - name: build_linux_s390x - display_name: "RHEL 7 s390x (build)" + display_name: "RHEL 7 s390x (Build)" run_on: rhel7-zseries-large tags: [] expansions: @@ -14638,372 +14771,346 @@ buildvariants: mongosh_test_e2e_force_fips: "" tasks: - name: compile_artifact - - name: e2e_tests_rhel70_large_70x - display_name: "RHEL 7.0 x64 m70x (E2E tests)" + - name: e2e_tests_rhel70_large_m70x + display_name: "RHEL 7.0 x64 70x (E2E tests)" run_on: rhel70-large tags: [] expansions: - executable_os_id: "" + executable_os_id: "linux-x64" 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: compile_artifact - - name: e2e_tests - - name: perf_tests - - name: e2e_tests_rhel76_large_70x - display_name: "RHEL 7.6 x64 m70x (E2E tests)" + - name: e2e_tests_build_linux_x64 + - name: perf_tests_build_linux_x64 + - name: e2e_tests_rhel76_large_m70x + display_name: "RHEL 7.6 x64 70x (E2E tests)" run_on: rhel76-large tags: [] expansions: - executable_os_id: "" + executable_os_id: "linux-x64" 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: compile_artifact - - name: e2e_tests - - name: perf_tests + - name: e2e_tests_build_linux_x64 + - name: perf_tests_build_linux_x64 - name: e2e_tests_rhel80_small display_name: "RHEL 8.0 x64 (E2E tests)" run_on: rhel80-small tags: [] expansions: - executable_os_id: "" + executable_os_id: "linux-x64" 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: compile_artifact - - name: e2e_tests - - name: perf_tests - - name: e2e_tests_rhel90_small_70x - display_name: "RHEL 9.0 x64 m70x (E2E tests)" + - name: e2e_tests_build_linux_x64 + - name: perf_tests_build_linux_x64 + - name: e2e_tests_rhel90_small_m70x + display_name: "RHEL 9.0 x64 70x (E2E tests)" run_on: rhel90-small tags: [] expansions: - executable_os_id: "" + executable_os_id: "linux-x64" 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: compile_artifact - - name: e2e_tests - - name: perf_tests + - name: e2e_tests_build_linux_x64 + - name: perf_tests_build_linux_x64 - name: e2e_tests_rhel93_small display_name: "RHEL 9.3 x64 (E2E tests)" run_on: rhel93-small tags: [] expansions: - executable_os_id: "" + executable_os_id: "linux-x64" 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: compile_artifact - - name: e2e_tests - - name: perf_tests + - name: e2e_tests_build_linux_x64 + - name: perf_tests_build_linux_x64 - name: e2e_tests_rhel83_fips display_name: "RHEL 8.3 x64 (E2E tests)" run_on: rhel83-fips tags: [] expansions: - executable_os_id: "" + executable_os_id: "linux-x64" 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: compile_artifact - - name: e2e_tests - - name: perf_tests + - name: e2e_tests_build_linux_x64 + - name: perf_tests_build_linux_x64 - name: e2e_tests_rhel83_fips_openssl11 display_name: "RHEL 8.3 x64 openssl11 (E2E tests)" run_on: rhel83-fips tags: [] expansions: - executable_os_id: "" + executable_os_id: "linux-x64" 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: compile_artifact - - name: e2e_tests - - name: perf_tests + - name: e2e_tests_build_linux_x64 + - name: perf_tests_build_linux_x64 - name: e2e_tests_rhel83_fips_openssl11_true display_name: "RHEL 8.3 x64 openssl11 FIPS (E2E tests)" run_on: rhel83-fips tags: [] expansions: - executable_os_id: "" + executable_os_id: "linux-x64" 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: compile_artifact - - name: e2e_tests - - name: perf_tests + - name: e2e_tests_build_linux_x64 + - name: perf_tests_build_linux_x64 - name: e2e_tests_rhel93_fips display_name: "RHEL 9.3 x64 (E2E tests)" run_on: rhel93-fips tags: [] expansions: - executable_os_id: "" + executable_os_id: "linux-x64" 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: compile_artifact - - name: e2e_tests - - name: perf_tests + - name: e2e_tests_build_linux_x64 + - name: perf_tests_build_linux_x64 - name: e2e_tests_rhel93_fips_openssl3 display_name: "RHEL 9.3 x64 openssl3 (E2E tests)" run_on: rhel93-fips tags: [] expansions: - executable_os_id: "" + executable_os_id: "linux-x64" 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: compile_artifact - - name: e2e_tests - - name: perf_tests + - name: e2e_tests_build_linux_x64 + - name: perf_tests_build_linux_x64 - name: e2e_tests_rhel93_fips_openssl3_true display_name: "RHEL 9.3 x64 openssl3 FIPS (E2E tests)" run_on: rhel93-fips tags: [] expansions: - executable_os_id: "" + executable_os_id: "linux-x64" 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: compile_artifact - - name: e2e_tests - - name: perf_tests - - name: e2e_tests_ubuntu1804_large_60x - display_name: "Ubuntu 18.04 x64 m60x (E2E tests)" + - name: e2e_tests_build_linux_x64 + - name: perf_tests_build_linux_x64 + - name: e2e_tests_ubuntu1804_large_m60x + display_name: "Ubuntu 18.04 x64 60x (E2E tests)" run_on: ubuntu1804-large tags: [] expansions: - executable_os_id: "" + executable_os_id: "linux-x64" 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: compile_artifact - - name: e2e_tests - - name: perf_tests + - name: e2e_tests_build_linux_x64 + - name: perf_tests_build_linux_x64 - name: e2e_tests_ubuntu2004_small display_name: "Ubuntu 20.04 x64 (E2E tests)" run_on: ubuntu2004-small tags: [] expansions: - executable_os_id: "" + executable_os_id: "linux-x64" 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: compile_artifact - - name: e2e_tests - - name: perf_tests + - name: e2e_tests_build_linux_x64 + - name: perf_tests_build_linux_x64 - name: e2e_tests_ubuntu2004_small_openssl11 display_name: "Ubuntu 20.04 x64 openssl11 (E2E tests)" run_on: ubuntu2004-small tags: [] expansions: - executable_os_id: "" + executable_os_id: "linux-x64" 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: compile_artifact - - name: e2e_tests - - name: perf_tests + - name: e2e_tests_build_linux_x64 + - name: perf_tests_build_linux_x64 - name: e2e_tests_ubuntu2204_small display_name: "Ubuntu 22.04 x64 (E2E tests)" run_on: ubuntu2204-small tags: [] expansions: - executable_os_id: "" + executable_os_id: "linux-x64" 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: compile_artifact - - name: e2e_tests - - name: perf_tests + - name: e2e_tests_build_linux_x64 + - name: perf_tests_build_linux_x64 - name: e2e_tests_ubuntu2204_small_openssl3 display_name: "Ubuntu 22.04 x64 openssl3 (E2E tests)" run_on: ubuntu2204-small tags: [] expansions: - executable_os_id: "" + executable_os_id: "linux-x64" 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: compile_artifact - - name: e2e_tests - - name: perf_tests + - name: e2e_tests_build_linux_x64 + - name: perf_tests_build_linux_x64 - name: e2e_tests_ubuntu2404_small display_name: "Ubuntu 24.04 x64 (E2E tests)" run_on: ubuntu2404-small tags: [] expansions: - executable_os_id: "" + executable_os_id: "linux-x64" 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: compile_artifact - - name: e2e_tests - - name: perf_tests + - name: e2e_tests_build_linux_x64 + - name: perf_tests_build_linux_x64 - name: e2e_tests_ubuntu2404_small_openssl3 display_name: "Ubuntu 24.04 x64 openssl3 (E2E tests)" run_on: ubuntu2404-small tags: [] expansions: - executable_os_id: "" + executable_os_id: "linux-x64" 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: compile_artifact - - name: e2e_tests - - name: perf_tests - - name: e2e_tests_debian10_small_60x - display_name: "Debian 10 x64 m60x (E2E tests)" + - name: e2e_tests_build_linux_x64 + - name: perf_tests_build_linux_x64 + - name: e2e_tests_debian10_small_m60x + display_name: "Debian 10 x64 60x (E2E tests)" run_on: debian10-small tags: [] expansions: - executable_os_id: "" + executable_os_id: "linux-x64" 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: compile_artifact - - name: e2e_tests - - name: perf_tests - - name: e2e_tests_debian10_small_openssl11_60x - display_name: "Debian 10 x64 m60x openssl11 (E2E tests)" + - name: e2e_tests_build_linux_x64 + - name: perf_tests_build_linux_x64 + - name: e2e_tests_debian10_small_openssl11_m60x + display_name: "Debian 10 x64 60x openssl11 (E2E tests)" run_on: debian10-small tags: [] expansions: - executable_os_id: "" + executable_os_id: "linux-x64" 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: compile_artifact - - name: e2e_tests - - name: perf_tests - - name: e2e_tests_debian11_small_70x - display_name: "Debian 11 x64 m70x (E2E tests)" + - name: e2e_tests_build_linux_x64 + - name: perf_tests_build_linux_x64 + - name: e2e_tests_debian11_small_m70x + display_name: "Debian 11 x64 70x (E2E tests)" run_on: debian11-small tags: [] expansions: - executable_os_id: "" + executable_os_id: "linux-x64" 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: compile_artifact - - name: e2e_tests - - name: perf_tests - - name: e2e_tests_debian11_small_openssl11_70x - display_name: "Debian 11 x64 m70x openssl11 (E2E tests)" + - name: e2e_tests_build_linux_x64 + - name: perf_tests_build_linux_x64 + - name: e2e_tests_debian11_small_openssl11_m70x + display_name: "Debian 11 x64 70x openssl11 (E2E tests)" run_on: debian11-small tags: [] expansions: - executable_os_id: "" + executable_os_id: "linux-x64" 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: compile_artifact - - name: e2e_tests - - name: perf_tests - - name: e2e_tests_amazon2_large_70x - display_name: "Amazon Linux 2 x64 m70x (E2E tests)" + - name: e2e_tests_build_linux_x64 + - name: perf_tests_build_linux_x64 + - name: e2e_tests_amazon2_large_m70x + display_name: "Amazon Linux 2 x64 70x (E2E tests)" run_on: amazon2-large tags: [] expansions: - executable_os_id: "" + executable_os_id: "linux-x64" 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: compile_artifact - - name: e2e_tests - - name: perf_tests + - name: e2e_tests_build_linux_x64 + - name: perf_tests_build_linux_x64 - name: e2e_tests_amazon2023.0_small display_name: "Amazon Linux 2023 x64 (E2E tests)" run_on: amazon2023.0-small tags: [] expansions: - executable_os_id: "" + executable_os_id: "linux-x64" 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: compile_artifact - - name: e2e_tests - - name: perf_tests - - name: e2e_tests_suse12_sp5_large_70x - display_name: "SLES 12 x64 m70x (E2E tests)" + - name: e2e_tests_build_linux_x64 + - name: perf_tests_build_linux_x64 + - name: e2e_tests_suse12_sp5_large_m70x + display_name: "SLES 12 x64 70x (E2E tests)" run_on: suse12-sp5-large tags: [] expansions: - executable_os_id: "" + executable_os_id: "linux-x64" 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: compile_artifact - - name: e2e_tests - - name: perf_tests + - name: e2e_tests_build_linux_x64 + - name: perf_tests_build_linux_x64 - name: e2e_tests_suse15sp4_small display_name: "SLES 15 x64 (E2E tests)" run_on: suse15sp4-small tags: [] expansions: - executable_os_id: "" + executable_os_id: "linux-x64" 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: compile_artifact - - name: e2e_tests - - name: perf_tests - - name: e2e_tests_ubuntu1804_arm64_large_60x - display_name: "Ubuntu 18.04 arm64 m60x (E2E tests)" + - name: e2e_tests_build_linux_x64 + - name: perf_tests_build_linux_x64 + - name: e2e_tests_ubuntu1804_arm64_large_m60x + display_name: "Ubuntu 18.04 arm64 60x (E2E tests)" run_on: ubuntu1804-arm64-large tags: [] expansions: @@ -15100,8 +15207,8 @@ buildvariants: - name: compile_artifact - name: e2e_tests - name: perf_tests - - name: e2e_tests_amazon2_arm64_large_70x - display_name: "Amazon Linux 2 arm64 m70x (E2E tests)" + - name: e2e_tests_amazon2_arm64_large_m70x + display_name: "Amazon Linux 2 arm64 70x (E2E tests)" run_on: amazon2-arm64-large tags: [] expansions: @@ -15142,8 +15249,8 @@ buildvariants: - name: compile_artifact - name: e2e_tests - name: perf_tests - - name: e2e_tests_rhel90_arm64_small_70x - display_name: "RHEL 9.0 arm64 m70x (E2E tests)" + - name: e2e_tests_rhel90_arm64_small_m70x + display_name: "RHEL 9.0 arm64 70x (E2E tests)" run_on: rhel90-arm64-small tags: [] expansions: @@ -15156,8 +15263,8 @@ buildvariants: - name: compile_artifact - name: e2e_tests - name: perf_tests - - name: e2e_tests_rhel90_arm64_small_openssl3_70x - display_name: "RHEL 9.0 arm64 m70x openssl3 (E2E tests)" + - name: e2e_tests_rhel90_arm64_small_openssl3_m70x + display_name: "RHEL 9.0 arm64 70x openssl3 (E2E tests)" run_on: rhel90-arm64-small tags: [] expansions: @@ -15212,8 +15319,8 @@ buildvariants: - name: compile_artifact - name: e2e_tests - name: perf_tests - - name: e2e_tests_rhel7_zseries_large_60x - display_name: "RHEL 7 s390x m60x (E2E tests)" + - name: e2e_tests_rhel7_zseries_large_m60x + display_name: "RHEL 7 s390x 60x (E2E tests)" run_on: rhel7-zseries-large tags: [] expansions: @@ -15240,7 +15347,7 @@ buildvariants: - name: compile_artifact - name: e2e_tests - name: perf_tests - - name: e2e_tests_darwin_x64 + - name: e2e_tests_macos_14 display_name: "MacOS 14 x64 (E2E tests)" run_on: macos-14 tags: [] @@ -15251,10 +15358,9 @@ buildvariants: mongosh_server_test_version: "stable-enterprise" mongosh_test_e2e_force_fips: "" tasks: - - name: compile_artifact - - name: e2e_tests - - name: perf_tests - - name: e2e_tests_darwin_arm64 + - name: e2e_tests_darwin + - name: perf_tests_darwin + - name: e2e_tests_macos_14_arm64 display_name: "MacOS 14 arm64 (E2E tests)" run_on: macos-14-arm64 tags: [] @@ -15265,9 +15371,8 @@ buildvariants: mongosh_server_test_version: "stable-enterprise" mongosh_test_e2e_force_fips: "" tasks: - - name: compile_artifact - - name: e2e_tests - - name: perf_tests + - name: e2e_tests_darwin_arm64 + - name: perf_tests_darwin_arm64 - name: darwin display_name: "MacOS Big Sur" run_on: macos-11 @@ -15275,7 +15380,7 @@ buildvariants: executable_os_id: darwin-x64 tasks: - name: compile_artifact - - name: e2e_tests_darwin_x64 + - name: e2e_tests_darwin - name: package_artifact_darwin_x64 - name: sign_artifact_darwin_x64 - name: package_artifact_darwin_arm64 @@ -15424,7 +15529,7 @@ buildvariants: expansions: executable_os_id: win32 tasks: - - name: e2e_tests_win32 + - name: e2e_tests_build_win32 - name: package_artifact_win32_x64 - name: package_artifact_win32msi_x64 - name: build_win32 @@ -15623,6 +15728,6 @@ buildvariants: display_name: "Performance Tests" run_on: rhel90-dbx-perf-large tasks: - - name: perf_tests + - name: perf_tests_build_linux_x64 expansions: executable_os_id: linux_x64 diff --git a/.evergreen/evergreen.yml.in b/.evergreen/evergreen.yml.in index 4d29aac5a..7c7a97c0a 100644 --- a/.evergreen/evergreen.yml.in +++ b/.evergreen/evergreen.yml.in @@ -78,294 +78,407 @@ for (const { shortName: nShort, versionSpec: nVersion, skipNodeVersionCheck } of const { RELEASE_PACKAGE_MATRIX } = require('../config/release-package-matrix'); -const ALL_E2E_TEST_BUILD_VARIANTS = [{ - displayName: "RHEL 7.0 x64", - runOn: "rhel70-build", - isBuild: true, - executableOsId: "linux-x64", - mVersion: "stable" -}, { - displayName: "RHEL 8.0 x64", - name: 'linux_x64_rhel8', - runOn: "rhel80-build", - isBuild: true, - executableOsId: "linux-x64", - mVersion: "stable" -}, { - displayName: "RHEL 7.0 x64", - runOn: "rhel70-build", - isBuild: true, - executableOsId: "linux-x64-openssl11", - sharedOpenSsl: "openssl11", - mVersion: "stable" -}, { - displayName: "RHEL 8.0 x64", - runOn: "rhel80-build", - isBuild: true, - executableOsId: "linux-x64-openssl11", - sharedOpenSsl: "openssl11", - name: 'linux_x64_build_rhel8_openssl11', - mVersion: "stable" -}, { - displayName: "RHEL 7.0 x64", - runOn: "rhel70-build", - isBuild: true, - executableOsId: "linux-x64-openssl3", - sharedOpenSsl: "openssl3", - mVersion: "stable" -}, { - displayName: "RHEL 8.0 x64", - name: 'linux_x64_openssl3_rhel8', - runOn: "rhel80-build", - isBuild: true, - executableOsId: "linux-x64-openssl3", - sharedOpenSsl: "openssl3", - mVersion: "stable" -}, { - displayName: "Amazon 2 arm64", - runOn: "amazon2-arm64-large", - isBuild: true, - executableOsId: "linux-arm64", - mVersion: "stable" -}, { - displayName: "Amazon 2 arm64", - runOn: "amazon2-arm64-large", - isBuild: true, - executableOsId: "linux-arm64-openssl11", - sharedOpenSsl: "openssl11", - mVersion: "stable" -}, { - displayName: "Amazon 2 arm64", - runOn: "amazon2-arm64-large", - isBuild: true, - executableOsId: "linux-arm64-openssl3", - sharedOpenSsl: "openssl3", - mVersion: "stable" -}, { - displayName: "RHEL 8 PPC", - runOn: "rhel8-power-small", - isBuild: true, - executableOsId: "linux-ppc64le", - mVersion: "stable" -}, { - displayName: "RHEL 7 s390x", - runOn: "rhel7-zseries-large", - isBuild: true, - executableOsId: "linux-s390x", - mVersion: "stable" -}, { - displayName: "RHEL 7.0 x64", - runOn: "rhel70-large", - mVersion: "7.0.x" -}, { - displayName: "RHEL 7.6 x64", - runOn: "rhel76-large", - mVersion: "7.0.x" -}, { - displayName: "RHEL 8.0 x64", - runOn: "rhel80-small", - mVersion: "stable" -}, { - displayName: "RHEL 9.0 x64", - runOn: "rhel90-small", - disabledOpenSslSharedConfig: true, - mVersion: "7.0.x" -}, { - displayName: "RHEL 9.3 x64", - runOn: "rhel93-small", - disabledOpenSslSharedConfig: true, - mVersion: "stable" -}, { - displayName: "RHEL 8.3 x64", - runOn: "rhel83-fips", - mVersion: "stable" -}, { - displayName: "RHEL 8.3 x64", - runOn: "rhel83-fips", - sharedOpenSsl: "openssl11", - mVersion: "stable" -}, { - displayName: "RHEL 8.3 x64", - runOn: "rhel83-fips", - fips: true, - sharedOpenSsl: "openssl11", - mVersion: "stable" -}, { - displayName: "RHEL 9.3 x64", - runOn: "rhel93-fips", - mVersion: "stable" -}, { - displayName: "RHEL 9.3 x64", - runOn: "rhel93-fips", - sharedOpenSsl: "openssl3", - mVersion: "stable" -}, { - displayName: "RHEL 9.3 x64", - runOn: "rhel93-fips", - fips: true, - sharedOpenSsl: "openssl3", - mVersion: "stable" -}, { - displayName: "Ubuntu 18.04 x64", - runOn: "ubuntu1804-large", - mVersion: "6.0.x" -}, { - displayName: "Ubuntu 20.04 x64", - runOn: "ubuntu2004-small", - mVersion: "stable" -}, { - displayName: "Ubuntu 20.04 x64", - runOn: "ubuntu2004-small", - sharedOpenSsl: "openssl11", - mVersion: "stable" -}, { - displayName: "Ubuntu 22.04 x64", - runOn: "ubuntu2204-small", - mVersion: "stable" -}, { - displayName: "Ubuntu 22.04 x64", - runOn: "ubuntu2204-small", - sharedOpenSsl: "openssl3", - mVersion: "stable" -}, { - displayName: "Ubuntu 24.04 x64", - runOn: "ubuntu2404-small", - mVersion: "stable" -}, { - displayName: "Ubuntu 24.04 x64", - runOn: "ubuntu2404-small", - sharedOpenSsl: "openssl3", - mVersion: "stable" -}, { - displayName: "Debian 10 x64", - runOn: "debian10-small", - mVersion: "6.0.x" -}, { - displayName: "Debian 10 x64", - runOn: "debian10-small", - sharedOpenSsl: "openssl11", - mVersion: "6.0.x" -}, { - displayName: "Debian 11 x64", - runOn: "debian11-small", - mVersion: "7.0.x" -}, { - displayName: "Debian 11 x64", - runOn: "debian11-small", - sharedOpenSsl: "openssl11", - mVersion: "7.0.x" -}, { - displayName: "Amazon Linux 2 x64", - runOn: "amazon2-large", - mVersion: "7.0.x" -}, { - displayName: "Amazon Linux 2023 x64", - runOn: "amazon2023.0-small", - disabledOpenSslSharedConfig: true, - mVersion: "stable" -}, { - displayName: "SLES 12 x64", - runOn: "suse12-sp5-large", - mVersion: "7.0.x" -}, { - displayName: "SLES 15 x64", - runOn: "suse15sp4-small", - mVersion: "stable" -}, { - displayName: "Ubuntu 18.04 arm64", - runOn: "ubuntu1804-arm64-large", - mVersion: "6.0.x" -}, { - displayName: "Ubuntu 20.04 arm64", - runOn: "ubuntu2004-arm64-small", - mVersion: "stable" -}, { - displayName: "Ubuntu 20.04 arm64", - runOn: "ubuntu2004-arm64-small", - sharedOpenSsl: "openssl11", - mVersion: "stable" -}, { - displayName: "Ubuntu 22.04 arm64", - runOn: "ubuntu2204-arm64-small", - mVersion: "stable" -}, { - displayName: "Ubuntu 22.04 arm64", - runOn: "ubuntu2204-arm64-small", - sharedOpenSsl: "openssl3", - mVersion: "stable" -}, { - displayName: "Ubuntu 24.04 arm64", - runOn: "ubuntu2404-arm64-small", - mVersion: "stable" -}, { - displayName: "Ubuntu 24.04 arm64", - runOn: "ubuntu2404-arm64-small", - sharedOpenSsl: "openssl3", - mVersion: "stable" -}, { - displayName: "Amazon Linux 2 arm64", - runOn: "amazon2-arm64-large", - mVersion: "7.0.x" -}, { - displayName: "Amazon Linux 2023 arm64", - runOn: "amazon2023.0-arm64-small", - disabledOpenSslSharedConfig: true, - mVersion: "stable" -}, { - displayName: "RHEL 8.2 arm64", - runOn: "rhel82-arm64-small", - mVersion: "stable" -}, { - displayName: "RHEL 9.0 arm64", - runOn: "rhel90-arm64-small", - disabledOpenSslSharedConfig: true, - mVersion: "7.0.x" -}, { - displayName: "RHEL 9.0 arm64", - runOn: "rhel90-arm64-small", - disabledOpenSslSharedConfig: true, - sharedOpenSsl: "openssl3", - mVersion: "7.0.x" -}, { - displayName: "RHEL 9.3 arm64", - runOn: "rhel93-arm64-small", - disabledOpenSslSharedConfig: true, - mVersion: "stable" -}, { - displayName: "RHEL 9.3 arm64", - runOn: "rhel93-arm64-small", - disabledOpenSslSharedConfig: true, - sharedOpenSsl: "openssl3", - mVersion: "stable" -}, { - displayName: "RHEL 8 PPC", - runOn: "rhel8-power-small", - mVersion: "stable" -}, { - displayName: "RHEL 7 s390x", - runOn: "rhel7-zseries-large", - mVersion: "6.0.x" -}, { - displayName: "RHEL 8 s390x", - runOn: "rhel8-zseries-small", - mVersion: "stable" -}, { - displayName: "MacOS 14 x64", - runOn: "macos-14", - executableOsId: "darwin-x64", - mVersion: "stable" -}, { - displayName: "MacOS 14 arm64", - runOn: "macos-14-arm64", - executableOsId: "darwin-arm64", - mVersion: "stable" -}].map(({displayName, ...rest}) => { +const ALL_E2E_TEST_BUILD_VARIANTS = [ + { + displayName: "RHEL 7.0 x64", + runOn: "rhel70-build", + isBuild: true, + name: "linux_x64", + executableOsId: "linux-x64", + mVersion: "stable" + }, + { + displayName: "RHEL 8.0 x64", + runOn: "rhel80-build", + isBuild: true, + name: "linux_x64_rhel8", + executableOsId: "linux-x64", + mVersion: "stable" + }, + { + displayName: "RHEL 7.0 x64", + runOn: "rhel70-build", + isBuild: true, + name: "linux_x64_openssl11", + executableOsId: "linux-x64-openssl11", + sharedOpenSsl: "openssl11", + mVersion: "stable" + }, + { + displayName: "RHEL 8.0 x64", + runOn: "rhel80-build", + isBuild: true, + name: "linux_x64_openssl11_rhel8", + executableOsId: "linux-x64-openssl11", + sharedOpenSsl: "openssl11", + mVersion: "stable" + }, + { + displayName: "RHEL 7.0 x64", + runOn: "rhel70-build", + isBuild: true, + name: "linux_x64_openssl3", + executableOsId: "linux-x64-openssl3", + sharedOpenSsl: "openssl3", + mVersion: "stable" + }, + { + displayName: "RHEL 8.0 x64", + runOn: "rhel80-build", + isBuild: true, + name: "linux_x64_openssl3_rhel8", + executableOsId: "linux-x64-openssl3", + sharedOpenSsl: "openssl3", + mVersion: "stable" + }, + { + displayName: "Amazon 2 arm64", + runOn: "amazon2-arm64-large", + isBuild: true, + name: "linux_arm64", + executableOsId: "linux-arm64", + mVersion: "stable" + }, + { + displayName: "Amazon 2 arm64", + runOn: "amazon2-arm64-large", + isBuild: true, + name: "linux_arm64_openssl11", + executableOsId: "linux-arm64-openssl11", + sharedOpenSsl: "openssl11", + mVersion: "stable" + }, + { + displayName: "Amazon 2 arm64", + runOn: "amazon2-arm64-large", + isBuild: true, + name: "linux_arm64_openssl3", + executableOsId: "linux-arm64-openssl3", + sharedOpenSsl: "openssl3", + mVersion: "stable" + }, + { + displayName: "RHEL 8 PPC", + runOn: "rhel8-power-small", + isBuild: true, + name: "linux_ppc64le", + executableOsId: "linux-ppc64le", + mVersion: "stable" + }, + { + displayName: "RHEL 7 s390x", + runOn: "rhel7-zseries-large", + isBuild: true, + name: "linux_s390x", + executableOsId: "linux-s390x", + mVersion: "stable" + }, + { + displayName: "RHEL 7.0 x64", + runOn: "rhel70-large", + executableOsId: "linux-x64", + mVersion: "7.0.x" + }, + { + displayName: "RHEL 7.6 x64", + runOn: "rhel76-large", + executableOsId: "linux-x64", + mVersion: "7.0.x" + }, + { + displayName: "RHEL 8.0 x64", + runOn: "rhel80-small", + executableOsId: "linux-x64", + mVersion: "stable" + }, + { + displayName: "RHEL 9.0 x64", + runOn: "rhel90-small", + disabledOpenSslSharedConfig: true, + executableOsId: "linux-x64", + mVersion: "7.0.x" + }, + { + displayName: "RHEL 9.3 x64", + runOn: "rhel93-small", + disabledOpenSslSharedConfig: true, + executableOsId: "linux-x64", + mVersion: "stable" + }, + { + displayName: "RHEL 8.3 x64", + runOn: "rhel83-fips", + executableOsId: "linux-x64", + mVersion: "stable" + }, + { + displayName: "RHEL 8.3 x64", + runOn: "rhel83-fips", + sharedOpenSsl: "openssl11", + executableOsId: "linux-x64", + mVersion: "stable" + }, + { + displayName: "RHEL 8.3 x64", + runOn: "rhel83-fips", + fips: true, + sharedOpenSsl: "openssl11", + executableOsId: "linux-x64", + mVersion: "stable" + }, + { + displayName: "RHEL 9.3 x64", + runOn: "rhel93-fips", + executableOsId: "linux-x64", + mVersion: "stable" + }, + { + displayName: "RHEL 9.3 x64", + runOn: "rhel93-fips", + sharedOpenSsl: "openssl3", + executableOsId: "linux-x64", + mVersion: "stable" + }, + { + displayName: "RHEL 9.3 x64", + runOn: "rhel93-fips", + fips: true, + sharedOpenSsl: "openssl3", + executableOsId: "linux-x64", + mVersion: "stable" + }, + { + displayName: "Ubuntu 18.04 x64", + runOn: "ubuntu1804-large", + executableOsId: "linux-x64", + mVersion: "6.0.x" + }, + { + displayName: "Ubuntu 20.04 x64", + runOn: "ubuntu2004-small", + executableOsId: "linux-x64", + mVersion: "stable" + }, + { + displayName: "Ubuntu 20.04 x64", + runOn: "ubuntu2004-small", + sharedOpenSsl: "openssl11", + executableOsId: "linux-x64", + mVersion: "stable" + }, + { + displayName: "Ubuntu 22.04 x64", + runOn: "ubuntu2204-small", + executableOsId: "linux-x64", + mVersion: "stable" + }, + { + displayName: "Ubuntu 22.04 x64", + runOn: "ubuntu2204-small", + sharedOpenSsl: "openssl3", + executableOsId: "linux-x64", + mVersion: "stable" + }, + { + displayName: "Ubuntu 24.04 x64", + runOn: "ubuntu2404-small", + executableOsId: "linux-x64", + mVersion: "stable" + }, + { + displayName: "Ubuntu 24.04 x64", + runOn: "ubuntu2404-small", + sharedOpenSsl: "openssl3", + executableOsId: "linux-x64", + mVersion: "stable" + }, + { + displayName: "Debian 10 x64", + runOn: "debian10-small", + executableOsId: "linux-x64", + mVersion: "6.0.x" + }, + { + displayName: "Debian 10 x64", + runOn: "debian10-small", + sharedOpenSsl: "openssl11", + executableOsId: "linux-x64", + mVersion: "6.0.x" + }, + { + displayName: "Debian 11 x64", + runOn: "debian11-small", + executableOsId: "linux-x64", + mVersion: "7.0.x" + }, + { + displayName: "Debian 11 x64", + runOn: "debian11-small", + sharedOpenSsl: "openssl11", + executableOsId: "linux-x64", + mVersion: "7.0.x" + }, + { + displayName: "Amazon Linux 2 x64", + runOn: "amazon2-large", + executableOsId: "linux-x64", + mVersion: "7.0.x" + }, + { + displayName: "Amazon Linux 2023 x64", + runOn: "amazon2023.0-small", + disabledOpenSslSharedConfig: true, + executableOsId: "linux-x64", + mVersion: "stable" + }, + { + displayName: "SLES 12 x64", + runOn: "suse12-sp5-large", + executableOsId: "linux-x64", + mVersion: "7.0.x" + }, + { + displayName: "SLES 15 x64", + runOn: "suse15sp4-small", + executableOsId: "linux-x64", + mVersion: "stable" + }, + { + displayName: "Ubuntu 18.04 arm64", + runOn: "ubuntu1804-arm64-large", + mVersion: "6.0.x" + }, + { + displayName: "Ubuntu 20.04 arm64", + runOn: "ubuntu2004-arm64-small", + mVersion: "stable" + }, + { + displayName: "Ubuntu 20.04 arm64", + runOn: "ubuntu2004-arm64-small", + sharedOpenSsl: "openssl11", + mVersion: "stable" + }, + { + displayName: "Ubuntu 22.04 arm64", + runOn: "ubuntu2204-arm64-small", + mVersion: "stable" + }, + { + displayName: "Ubuntu 22.04 arm64", + runOn: "ubuntu2204-arm64-small", + sharedOpenSsl: "openssl3", + mVersion: "stable" + }, + { + displayName: "Ubuntu 24.04 arm64", + runOn: "ubuntu2404-arm64-small", + mVersion: "stable" + }, + { + displayName: "Ubuntu 24.04 arm64", + runOn: "ubuntu2404-arm64-small", + sharedOpenSsl: "openssl3", + mVersion: "stable" + }, + { + displayName: "Amazon Linux 2 arm64", + runOn: "amazon2-arm64-large", + mVersion: "7.0.x" + }, + { + displayName: "Amazon Linux 2023 arm64", + runOn: "amazon2023.0-arm64-small", + disabledOpenSslSharedConfig: true, + mVersion: "stable" + }, + { + displayName: "RHEL 8.2 arm64", + runOn: "rhel82-arm64-small", + mVersion: "stable" + }, + { + displayName: "RHEL 9.0 arm64", + runOn: "rhel90-arm64-small", + disabledOpenSslSharedConfig: true, + mVersion: "7.0.x" + }, + { + displayName: "RHEL 9.0 arm64", + runOn: "rhel90-arm64-small", + disabledOpenSslSharedConfig: true, + sharedOpenSsl: "openssl3", + mVersion: "7.0.x" + }, + { + displayName: "RHEL 9.3 arm64", + runOn: "rhel93-arm64-small", + disabledOpenSslSharedConfig: true, + mVersion: "stable" + }, + { + displayName: "RHEL 9.3 arm64", + runOn: "rhel93-arm64-small", + disabledOpenSslSharedConfig: true, + sharedOpenSsl: "openssl3", + mVersion: "stable" + }, + { + displayName: "RHEL 8 PPC", + runOn: "rhel8-power-small", + mVersion: "stable" + }, + { + displayName: "RHEL 7 s390x", + runOn: "rhel7-zseries-large", + mVersion: "6.0.x" + }, + { + displayName: "RHEL 8 s390x", + runOn: "rhel8-zseries-small", + mVersion: "stable" + }, + { + displayName: "MacOS 14 x64", + runOn: "macos-14", + executableOsId: "darwin-x64", + mVersion: "stable" + }, + { + displayName: "MacOS 14 arm64", + runOn: "macos-14-arm64", + executableOsId: "darwin-arm64", + mVersion: "stable" + } +].map(({displayName, ...rest}) => { const {fips, sharedOpenSsl, isBuild, mVersion, runOn, executableOsId, name} = rest; - const id = (name ?? executableOsId ?? runOn).replaceAll('-', '_'); + const id = (name ?? runOn ?? executableOsId).replaceAll('-', '_'); + + const variantName = [ + isBuild ? `build` : 'e2e_tests', + id, + !id.includes('openssl') ? sharedOpenSsl : undefined, + mVersion != 'stable' ? `m${mVersion.replaceAll('.', '')}` : undefined, + fips, + ].filter(text => text).join('_'); + + const formattedDisplayName = [ + displayName, + mVersion != 'stable' ? mVersion.replaceAll('.', '') : undefined, + sharedOpenSsl, + fips ? 'FIPS' : undefined, + isBuild ? '(Build)' : '(E2E tests)' + ].filter(text => text).join(' '); + + let compileBuildVariant = RELEASE_PACKAGE_MATRIX.find((pkg) => pkg.executableOsId == executableOsId)?.compileBuildVariant; + // We have a separate build variant for win32 + if (compileBuildVariant == 'win32') compileBuildVariant = 'build_win32'; + return ({ ...rest, - name: `${isBuild ? `build` : 'e2e_tests'}_${id}${sharedOpenSsl && !id.includes('openssl') ? `_${sharedOpenSsl}` : ''}${mVersion != 'stable' ? `_${mVersion.replaceAll('.', '')}` : ''}${fips ? `_${fips}` : ''}`, - displayName: `${displayName}${mVersion != 'stable' ? ` m${mVersion.replaceAll('.', '')}` : ''}${sharedOpenSsl ? ` ${sharedOpenSsl}` : ''}${fips ? ' FIPS' : ''} (${isBuild ? 'build' : 'E2E tests'})` + displayName: formattedDisplayName, + name: variantName, + compileBuildVariant, }); }); @@ -1553,10 +1666,15 @@ tasks: ### # E2E TESTS ### - - name: e2e_tests + # Some tests reuse the same compilation build variant, so we create those variations of tasks to set those dependencies. + <% for (const compileBuildVariant of ['', 'build_linux_x64', 'darwin', 'darwin_arm64', 'build_win32']) { %> + - name: e2e_tests<% out(compileBuildVariant ? `_${compileBuildVariant}` : '') %> tags: ["e2e-test"] depends_on: - name: compile_artifact + <% if (compileBuildVariant != '') { %> + variant: <% out(compileBuildVariant) %> + <% } %> commands: - func: checkout - func: install @@ -1571,10 +1689,13 @@ tasks: 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 + - name: perf_tests<% out(compileBuildVariant ? `_${compileBuildVariant}` : '') %> tags: ["perf-test"] depends_on: - name: compile_artifact + <% if (compileBuildVariant != '') { %> + variant: <% out(compileBuildVariant) %> + <% } %> commands: - func: checkout - func: install @@ -1584,7 +1705,8 @@ tasks: vars: executable_os_id: ${executable_os_id} - func: run_perf_tests - + <% } %> + ### # EXECUTABLE CONNECTIVITY TESTS ### @@ -1869,7 +1991,16 @@ buildvariants: mongosh_server_test_version: "<% out(variant.mVersion) %>-enterprise" mongosh_test_e2e_force_fips: "<% out(variant.fips ? '1' : '') %>" tasks: - <% for (const task of variant.isBuild ? ['compile_artifact'] : ['compile_artifact', 'e2e_tests', 'perf_tests']) { %> + <% + let tasks = []; + if (variant.isBuild || !variant.compileBuildVariant || variant.compileBuildVariant == variant.name) { + tasks.push('compile_artifact'); + } + if (!variant.isBuild) { + tasks.push(`e2e_tests${variant.compileBuildVariant ? `_${variant.compileBuildVariant}` : ''}`) + tasks.push(`perf_tests${variant.compileBuildVariant ? `_${variant.compileBuildVariant}` : ''}`) + } + for (const task of tasks) { %> - name: <% out(task) %> <% } %> <% } %> @@ -1880,7 +2011,7 @@ buildvariants: executable_os_id: darwin-x64 tasks: - name: compile_artifact - - name: e2e_tests_darwin_x64 + - name: e2e_tests_darwin - name: package_artifact_darwin_x64 - name: sign_artifact_darwin_x64 - name: package_artifact_darwin_arm64 @@ -1961,7 +2092,7 @@ buildvariants: expansions: executable_os_id: win32 tasks: - - name: e2e_tests_win32 + - name: e2e_tests_build_win32 - name: package_artifact_win32_x64 - name: package_artifact_win32msi_x64 - name: build_win32 @@ -2091,6 +2222,6 @@ buildvariants: display_name: "Performance Tests" run_on: rhel90-dbx-perf-large tasks: - - name: perf_tests + - name: perf_tests_build_linux_x64 expansions: executable_os_id: linux_x64