From 2127cbf334ef7cbaa6a16ab40247aa1c9264df73 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Tue, 15 Apr 2025 14:46:23 -0500 Subject: [PATCH 1/9] PYTHON-5316 Update tests for other hosts --- .evergreen/generated_configs/variants.yml | 14 ++++++-------- .evergreen/scripts/generate_config.py | 6 ++---- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/.evergreen/generated_configs/variants.yml b/.evergreen/generated_configs/variants.yml index dc46ae6bf9..22cd4c4226 100644 --- a/.evergreen/generated_configs/variants.yml +++ b/.evergreen/generated_configs/variants.yml @@ -2,7 +2,7 @@ buildvariants: # Alternative hosts tests - name: openssl-1.0.2-rhel7-python3.9 tasks: - - name: .5.0 .standalone !.sync_async + - name: .standard-linux .server-5.0 display_name: OpenSSL 1.0.2 RHEL7 Python3.9 run_on: - rhel79-small @@ -11,7 +11,7 @@ buildvariants: PYTHON_BINARY: /opt/python/3.9/bin/python3 - name: other-hosts-rhel9-fips tasks: - - name: .6.0 .standalone !.sync_async + - name: .standard-linux .server-latest display_name: Other hosts RHEL9-FIPS run_on: - rhel92-fips @@ -21,7 +21,7 @@ buildvariants: REQUIRE_FIPS: "1" - name: other-hosts-rhel8-zseries tasks: - - name: .6.0 .standalone !.sync_async + - name: .standard-linux .server-latest display_name: Other hosts RHEL8-zseries run_on: - rhel8-zseries-small @@ -30,7 +30,7 @@ buildvariants: NO_EXT: "1" - name: other-hosts-rhel8-power8 tasks: - - name: .6.0 .standalone !.sync_async + - name: .standard-linux .server-latest display_name: Other hosts RHEL8-POWER8 run_on: - rhel8-power-small @@ -39,7 +39,7 @@ buildvariants: NO_EXT: "1" - name: other-hosts-rhel8-arm64 tasks: - - name: .6.0 .standalone !.sync_async + - name: .standard-linux .server-latest display_name: Other hosts RHEL8-arm64 run_on: - rhel82-arm64-small @@ -48,9 +48,7 @@ buildvariants: NO_EXT: "1" - name: other-hosts-amazon2023 tasks: - - name: .latest !.sync_async .sharded_cluster .auth .ssl - - name: .latest !.sync_async .replica_set .noauth .ssl - - name: .latest !.sync_async .standalone .noauth .nossl + - name: .standard-linux .server-latest display_name: Other hosts Amazon2023 run_on: - amazon2023-arm64-latest-large-m8g diff --git a/.evergreen/scripts/generate_config.py b/.evergreen/scripts/generate_config.py index 75ee52de68..0b5b52be69 100644 --- a/.evergreen/scripts/generate_config.py +++ b/.evergreen/scripts/generate_config.py @@ -550,7 +550,7 @@ def create_alternative_hosts_variants(): host = HOSTS["rhel7"] variants.append( create_variant( - [".5.0 .standalone !.sync_async"], + [".standard-linux .server-5.0"], get_variant_name("OpenSSL 1.0.2", host, python=CPYTHONS[0]), host=host, python=CPYTHONS[0], @@ -564,9 +564,7 @@ def create_alternative_hosts_variants(): host = HOSTS[host_name] if "fips" in host_name.lower(): expansions["REQUIRE_FIPS"] = "1" - tags = [".6.0 .standalone !.sync_async"] - if host_name == "Amazon2023": - tags = [f".latest !.sync_async {t}" for t in SUB_TASKS] + tags = [".standard-linux .server-latest"] variants.append( create_variant( tags, From 2f32eec0b13e591bbd8ee5573bf95e6a6e347645 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Tue, 15 Apr 2025 14:50:58 -0500 Subject: [PATCH 2/9] update selectors --- .evergreen/generated_configs/variants.yml | 19 +++++++++++++------ .evergreen/scripts/generate_config.py | 9 ++++++--- 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/.evergreen/generated_configs/variants.yml b/.evergreen/generated_configs/variants.yml index 22cd4c4226..6b1629b955 100644 --- a/.evergreen/generated_configs/variants.yml +++ b/.evergreen/generated_configs/variants.yml @@ -2,58 +2,65 @@ buildvariants: # Alternative hosts tests - name: openssl-1.0.2-rhel7-python3.9 tasks: - - name: .standard-linux .server-5.0 + - name: .standalone-auth-ssl .server-version display_name: OpenSSL 1.0.2 RHEL7 Python3.9 run_on: - rhel79-small batchtime: 10080 expansions: + VERSION: "5.0" + PYTHON_VERSION: "3.9" PYTHON_BINARY: /opt/python/3.9/bin/python3 - name: other-hosts-rhel9-fips tasks: - - name: .standard-linux .server-latest + - name: .server-version .standalone-noauth-nossl .replica_set-noauth-ssl .sharded_cluster-auth-ssl display_name: Other hosts RHEL9-FIPS run_on: - rhel92-fips batchtime: 10080 expansions: + VERSION: latest NO_EXT: "1" REQUIRE_FIPS: "1" - name: other-hosts-rhel8-zseries tasks: - - name: .standard-linux .server-latest + - name: .server-version .standalone-noauth-nossl .replica_set-noauth-ssl .sharded_cluster-auth-ssl display_name: Other hosts RHEL8-zseries run_on: - rhel8-zseries-small batchtime: 10080 expansions: + VERSION: latest NO_EXT: "1" - name: other-hosts-rhel8-power8 tasks: - - name: .standard-linux .server-latest + - name: .server-version .standalone-noauth-nossl .replica_set-noauth-ssl .sharded_cluster-auth-ssl display_name: Other hosts RHEL8-POWER8 run_on: - rhel8-power-small batchtime: 10080 expansions: + VERSION: latest NO_EXT: "1" - name: other-hosts-rhel8-arm64 tasks: - - name: .standard-linux .server-latest + - name: .server-version .standalone-noauth-nossl .replica_set-noauth-ssl .sharded_cluster-auth-ssl display_name: Other hosts RHEL8-arm64 run_on: - rhel82-arm64-small batchtime: 10080 expansions: + VERSION: latest NO_EXT: "1" - name: other-hosts-amazon2023 tasks: - - name: .standard-linux .server-latest + - name: .server-version .standalone-noauth-nossl .replica_set-noauth-ssl .sharded_cluster-auth-ssl display_name: Other hosts Amazon2023 run_on: - amazon2023-arm64-latest-large-m8g batchtime: 10080 expansions: + VERSION: latest NO_EXT: "1" # Atlas connect tests diff --git a/.evergreen/scripts/generate_config.py b/.evergreen/scripts/generate_config.py index 0b5b52be69..3ed16c53cc 100644 --- a/.evergreen/scripts/generate_config.py +++ b/.evergreen/scripts/generate_config.py @@ -550,21 +550,24 @@ def create_alternative_hosts_variants(): host = HOSTS["rhel7"] variants.append( create_variant( - [".standard-linux .server-5.0"], + [".standalone-auth-ssl .server-version"], get_variant_name("OpenSSL 1.0.2", host, python=CPYTHONS[0]), host=host, python=CPYTHONS[0], batchtime=batchtime, + expansions=dict(VERSION="5.0", PYTHON_VERSION=CPYTHONS[0]), ) ) for host_name in OTHER_HOSTS: - expansions = dict() + expansions = dict(VERSION="latest") handle_c_ext(C_EXTS[0], expansions) host = HOSTS[host_name] if "fips" in host_name.lower(): expansions["REQUIRE_FIPS"] = "1" - tags = [".standard-linux .server-latest"] + tags = [ + ".server-version .standalone-noauth-nossl .replica_set-noauth-ssl .sharded_cluster-auth-ssl" + ] variants.append( create_variant( tags, From d3e635a86f035bc50c4f159f7d27244ad0e9263b Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Tue, 15 Apr 2025 14:52:49 -0500 Subject: [PATCH 3/9] update selectors --- .evergreen/generated_configs/variants.yml | 20 +++++++++++++++----- .evergreen/scripts/generate_config.py | 4 +++- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/.evergreen/generated_configs/variants.yml b/.evergreen/generated_configs/variants.yml index 6b1629b955..442ffe1b84 100644 --- a/.evergreen/generated_configs/variants.yml +++ b/.evergreen/generated_configs/variants.yml @@ -13,7 +13,9 @@ buildvariants: PYTHON_BINARY: /opt/python/3.9/bin/python3 - name: other-hosts-rhel9-fips tasks: - - name: .server-version .standalone-noauth-nossl .replica_set-noauth-ssl .sharded_cluster-auth-ssl + - name: .server-version .standalone-noauth-nossl + - name: .server-version .replica_set-noauth-ssl + - name: .server-version .sharded_cluster-auth-ssl display_name: Other hosts RHEL9-FIPS run_on: - rhel92-fips @@ -24,7 +26,9 @@ buildvariants: REQUIRE_FIPS: "1" - name: other-hosts-rhel8-zseries tasks: - - name: .server-version .standalone-noauth-nossl .replica_set-noauth-ssl .sharded_cluster-auth-ssl + - name: .server-version .standalone-noauth-nossl + - name: .server-version .replica_set-noauth-ssl + - name: .server-version .sharded_cluster-auth-ssl display_name: Other hosts RHEL8-zseries run_on: - rhel8-zseries-small @@ -34,7 +38,9 @@ buildvariants: NO_EXT: "1" - name: other-hosts-rhel8-power8 tasks: - - name: .server-version .standalone-noauth-nossl .replica_set-noauth-ssl .sharded_cluster-auth-ssl + - name: .server-version .standalone-noauth-nossl + - name: .server-version .replica_set-noauth-ssl + - name: .server-version .sharded_cluster-auth-ssl display_name: Other hosts RHEL8-POWER8 run_on: - rhel8-power-small @@ -44,7 +50,9 @@ buildvariants: NO_EXT: "1" - name: other-hosts-rhel8-arm64 tasks: - - name: .server-version .standalone-noauth-nossl .replica_set-noauth-ssl .sharded_cluster-auth-ssl + - name: .server-version .standalone-noauth-nossl + - name: .server-version .replica_set-noauth-ssl + - name: .server-version .sharded_cluster-auth-ssl display_name: Other hosts RHEL8-arm64 run_on: - rhel82-arm64-small @@ -54,7 +62,9 @@ buildvariants: NO_EXT: "1" - name: other-hosts-amazon2023 tasks: - - name: .server-version .standalone-noauth-nossl .replica_set-noauth-ssl .sharded_cluster-auth-ssl + - name: .server-version .standalone-noauth-nossl + - name: .server-version .replica_set-noauth-ssl + - name: .server-version .sharded_cluster-auth-ssl display_name: Other hosts Amazon2023 run_on: - amazon2023-arm64-latest-large-m8g diff --git a/.evergreen/scripts/generate_config.py b/.evergreen/scripts/generate_config.py index 3ed16c53cc..8f26635eaa 100644 --- a/.evergreen/scripts/generate_config.py +++ b/.evergreen/scripts/generate_config.py @@ -566,7 +566,9 @@ def create_alternative_hosts_variants(): if "fips" in host_name.lower(): expansions["REQUIRE_FIPS"] = "1" tags = [ - ".server-version .standalone-noauth-nossl .replica_set-noauth-ssl .sharded_cluster-auth-ssl" + ".server-version .standalone-noauth-nossl", + ".server-version .replica_set-noauth-ssl", + ".server-version .sharded_cluster-auth-ssl", ] variants.append( create_variant( From 4cbb368e8be86d0d1e36d845443e7e4e09ae543f Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Tue, 15 Apr 2025 14:54:02 -0500 Subject: [PATCH 4/9] update selectors --- .evergreen/generated_configs/variants.yml | 4 +++- .evergreen/scripts/generate_config.py | 12 ++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.evergreen/generated_configs/variants.yml b/.evergreen/generated_configs/variants.yml index 442ffe1b84..a73ceda7c0 100644 --- a/.evergreen/generated_configs/variants.yml +++ b/.evergreen/generated_configs/variants.yml @@ -2,7 +2,9 @@ buildvariants: # Alternative hosts tests - name: openssl-1.0.2-rhel7-python3.9 tasks: - - name: .standalone-auth-ssl .server-version + - name: .server-version .standalone-noauth-nossl + - name: .server-version .replica_set-noauth-ssl + - name: .server-version .sharded_cluster-auth-ssl display_name: OpenSSL 1.0.2 RHEL7 Python3.9 run_on: - rhel79-small diff --git a/.evergreen/scripts/generate_config.py b/.evergreen/scripts/generate_config.py index 8f26635eaa..4e0bbebfa4 100644 --- a/.evergreen/scripts/generate_config.py +++ b/.evergreen/scripts/generate_config.py @@ -546,11 +546,16 @@ def create_no_server_variants(): def create_alternative_hosts_variants(): batchtime = BATCHTIME_WEEK variants = [] + tags = [ + ".server-version .standalone-noauth-nossl", + ".server-version .replica_set-noauth-ssl", + ".server-version .sharded_cluster-auth-ssl", + ] host = HOSTS["rhel7"] variants.append( create_variant( - [".standalone-auth-ssl .server-version"], + tags, get_variant_name("OpenSSL 1.0.2", host, python=CPYTHONS[0]), host=host, python=CPYTHONS[0], @@ -565,11 +570,6 @@ def create_alternative_hosts_variants(): host = HOSTS[host_name] if "fips" in host_name.lower(): expansions["REQUIRE_FIPS"] = "1" - tags = [ - ".server-version .standalone-noauth-nossl", - ".server-version .replica_set-noauth-ssl", - ".server-version .sharded_cluster-auth-ssl", - ] variants.append( create_variant( tags, From 0dadf4e597b67b810279969327d6298f9e899d8b Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Tue, 15 Apr 2025 14:56:46 -0500 Subject: [PATCH 5/9] create tasks --- .evergreen/generated_configs/tasks.yml | 41 +++++++++++++++++++++++ .evergreen/generated_configs/variants.yml | 24 ++++--------- .evergreen/scripts/generate_config.py | 28 ++++++++++++---- 3 files changed, 68 insertions(+), 25 deletions(-) diff --git a/.evergreen/generated_configs/tasks.yml b/.evergreen/generated_configs/tasks.yml index 5b09ce20f7..97db6d8334 100644 --- a/.evergreen/generated_configs/tasks.yml +++ b/.evergreen/generated_configs/tasks.yml @@ -3083,6 +3083,47 @@ tasks: SUB_TEST_NAME: gke tags: [auth_oidc, auth_oidc_remote] + # Other hosts tests + - name: test-noauth-nossl-standalone + commands: + - func: run server + vars: + AUTH: noauth + SSL: nossl + TOPOLOGY: standalone + - func: run tests + vars: + AUTH: noauth + SSL: nossl + TOPOLOGY: standalone + tags: [other-hosts, standalone-noauth-nossl] + - name: test-noauth-ssl-replica-set + commands: + - func: run server + vars: + AUTH: noauth + SSL: ssl + TOPOLOGY: replica_set + - func: run tests + vars: + AUTH: noauth + SSL: ssl + TOPOLOGY: replica_set + tags: [other-hosts, replica_set-noauth-ssl] + - name: test-auth-ssl-sharded-cluster + commands: + - func: run server + vars: + AUTH: auth + SSL: ssl + TOPOLOGY: sharded_cluster + - func: run tests + vars: + AUTH: auth + SSL: ssl + TOPOLOGY: sharded_cluster + tags: [other-hosts, sharded_cluster-auth-ssl] + # Perf tests - name: perf-8.0-standalone-ssl commands: diff --git a/.evergreen/generated_configs/variants.yml b/.evergreen/generated_configs/variants.yml index a73ceda7c0..2648aa64c6 100644 --- a/.evergreen/generated_configs/variants.yml +++ b/.evergreen/generated_configs/variants.yml @@ -2,9 +2,7 @@ buildvariants: # Alternative hosts tests - name: openssl-1.0.2-rhel7-python3.9 tasks: - - name: .server-version .standalone-noauth-nossl - - name: .server-version .replica_set-noauth-ssl - - name: .server-version .sharded_cluster-auth-ssl + - name: .other-hosts display_name: OpenSSL 1.0.2 RHEL7 Python3.9 run_on: - rhel79-small @@ -15,9 +13,7 @@ buildvariants: PYTHON_BINARY: /opt/python/3.9/bin/python3 - name: other-hosts-rhel9-fips tasks: - - name: .server-version .standalone-noauth-nossl - - name: .server-version .replica_set-noauth-ssl - - name: .server-version .sharded_cluster-auth-ssl + - name: .other-hosts display_name: Other hosts RHEL9-FIPS run_on: - rhel92-fips @@ -28,9 +24,7 @@ buildvariants: REQUIRE_FIPS: "1" - name: other-hosts-rhel8-zseries tasks: - - name: .server-version .standalone-noauth-nossl - - name: .server-version .replica_set-noauth-ssl - - name: .server-version .sharded_cluster-auth-ssl + - name: .other-hosts display_name: Other hosts RHEL8-zseries run_on: - rhel8-zseries-small @@ -40,9 +34,7 @@ buildvariants: NO_EXT: "1" - name: other-hosts-rhel8-power8 tasks: - - name: .server-version .standalone-noauth-nossl - - name: .server-version .replica_set-noauth-ssl - - name: .server-version .sharded_cluster-auth-ssl + - name: .other-hosts display_name: Other hosts RHEL8-POWER8 run_on: - rhel8-power-small @@ -52,9 +44,7 @@ buildvariants: NO_EXT: "1" - name: other-hosts-rhel8-arm64 tasks: - - name: .server-version .standalone-noauth-nossl - - name: .server-version .replica_set-noauth-ssl - - name: .server-version .sharded_cluster-auth-ssl + - name: .other-hosts display_name: Other hosts RHEL8-arm64 run_on: - rhel82-arm64-small @@ -64,9 +54,7 @@ buildvariants: NO_EXT: "1" - name: other-hosts-amazon2023 tasks: - - name: .server-version .standalone-noauth-nossl - - name: .server-version .replica_set-noauth-ssl - - name: .server-version .sharded_cluster-auth-ssl + - name: .other-hosts display_name: Other hosts Amazon2023 run_on: - amazon2023-arm64-latest-large-m8g diff --git a/.evergreen/scripts/generate_config.py b/.evergreen/scripts/generate_config.py index 4e0bbebfa4..f718add4fa 100644 --- a/.evergreen/scripts/generate_config.py +++ b/.evergreen/scripts/generate_config.py @@ -546,16 +546,11 @@ def create_no_server_variants(): def create_alternative_hosts_variants(): batchtime = BATCHTIME_WEEK variants = [] - tags = [ - ".server-version .standalone-noauth-nossl", - ".server-version .replica_set-noauth-ssl", - ".server-version .sharded_cluster-auth-ssl", - ] host = HOSTS["rhel7"] variants.append( create_variant( - tags, + [".other-hosts"], get_variant_name("OpenSSL 1.0.2", host, python=CPYTHONS[0]), host=host, python=CPYTHONS[0], @@ -572,7 +567,7 @@ def create_alternative_hosts_variants(): expansions["REQUIRE_FIPS"] = "1" variants.append( create_variant( - tags, + [".other-hosts"], display_name=get_variant_name("Other hosts", host), batchtime=batchtime, host=host, @@ -618,6 +613,25 @@ def create_server_version_tasks(): return tasks +def create_other_hosts_tasks(): + tasks = [] + + for topology in TOPOLOGIES: + auth = "auth" if topology == "sharded_cluster" else "noauth" + ssl = "nossl" if topology == "standalone" else "ssl" + tags = [ + "other-hosts", + f"{topology}-{auth}-{ssl}", + ] + expansions = dict(AUTH=auth, SSL=ssl, TOPOLOGY=topology) + name = get_task_name("test", **expansions) + server_func = FunctionCall(func="run server", vars=expansions) + test_vars = expansions.copy() + test_func = FunctionCall(func="run tests", vars=test_vars) + tasks.append(EvgTask(name=name, tags=tags, commands=[server_func, test_func])) + return tasks + + def create_standard_linux_tasks(): tasks = [] From 718d9df0b66e0f03538049afd1fc8ffca522716d Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Tue, 15 Apr 2025 14:59:13 -0500 Subject: [PATCH 6/9] create tasks --- .evergreen/scripts/generate_config.py | 10 ++++------ .evergreen/scripts/generate_config_utils.py | 6 ++++++ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.evergreen/scripts/generate_config.py b/.evergreen/scripts/generate_config.py index f718add4fa..10e7141985 100644 --- a/.evergreen/scripts/generate_config.py +++ b/.evergreen/scripts/generate_config.py @@ -22,6 +22,7 @@ create_variant, get_assume_role, get_s3_put, + get_standard_auth_ssl, get_subprocess_exec, get_task_name, get_variant_name, @@ -617,8 +618,7 @@ def create_other_hosts_tasks(): tasks = [] for topology in TOPOLOGIES: - auth = "auth" if topology == "sharded_cluster" else "noauth" - ssl = "nossl" if topology == "standalone" else "ssl" + auth, ssl = get_standard_auth_ssl(topology) tags = [ "other-hosts", f"{topology}-{auth}-{ssl}", @@ -638,8 +638,7 @@ def create_standard_linux_tasks(): for (version, topology), python in zip_cycle( list(product(ALL_VERSIONS, TOPOLOGIES)), ALL_PYTHONS ): - auth = "auth" if topology == "sharded_cluster" else "noauth" - ssl = "nossl" if topology == "standalone" else "ssl" + auth, ssl = get_standard_auth_ssl(topology) tags = [ "standard-linux", f"server-{version}", @@ -662,8 +661,7 @@ def create_standard_non_linux_tasks(): for (version, topology), python, sync in zip_cycle( list(product(ALL_VERSIONS, TOPOLOGIES)), CPYTHONS, SYNCS ): - auth = "auth" if topology == "sharded_cluster" else "noauth" - ssl = "nossl" if topology == "standalone" else "ssl" + auth, ssl = get_standard_auth_ssl(topology) tags = [ "standard-non-linux", f"server-{version}", diff --git a/.evergreen/scripts/generate_config_utils.py b/.evergreen/scripts/generate_config_utils.py index aa43af9a68..facb832633 100644 --- a/.evergreen/scripts/generate_config_utils.py +++ b/.evergreen/scripts/generate_config_utils.py @@ -239,6 +239,12 @@ def handle_c_ext(c_ext, expansions) -> None: expansions["NO_EXT"] = "1" +def get_standard_auth_ssl(topology): + auth = "auth" if topology == "sharded_cluster" else "noauth" + ssl = "nossl" if topology == "standalone" else "ssl" + return auth, ssl + + def get_assume_role(**kwargs): kwargs.setdefault("command_type", EvgCommandType.SETUP) kwargs.setdefault("role_arn", "${assume_role_arn}") From 21b7fbbab290df011a05e40cb2d896f2a1ffeef9 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Tue, 15 Apr 2025 15:01:30 -0500 Subject: [PATCH 7/9] update names --- .evergreen/generated_configs/variants.yml | 24 +++++++++++------------ .evergreen/scripts/generate_config.py | 8 +++++--- 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/.evergreen/generated_configs/variants.yml b/.evergreen/generated_configs/variants.yml index 2648aa64c6..fe315ab9c0 100644 --- a/.evergreen/generated_configs/variants.yml +++ b/.evergreen/generated_configs/variants.yml @@ -1,9 +1,9 @@ buildvariants: # Alternative hosts tests - - name: openssl-1.0.2-rhel7-python3.9 + - name: openssl-1.0.2-rhel7-v5.0-python3.9 tasks: - name: .other-hosts - display_name: OpenSSL 1.0.2 RHEL7 Python3.9 + display_name: OpenSSL 1.0.2 RHEL7 v5.0 Python3.9 run_on: - rhel79-small batchtime: 10080 @@ -11,10 +11,10 @@ buildvariants: VERSION: "5.0" PYTHON_VERSION: "3.9" PYTHON_BINARY: /opt/python/3.9/bin/python3 - - name: other-hosts-rhel9-fips + - name: other-hosts-rhel9-fips-latest tasks: - name: .other-hosts - display_name: Other hosts RHEL9-FIPS + display_name: Other hosts RHEL9-FIPS latest run_on: - rhel92-fips batchtime: 10080 @@ -22,40 +22,40 @@ buildvariants: VERSION: latest NO_EXT: "1" REQUIRE_FIPS: "1" - - name: other-hosts-rhel8-zseries + - name: other-hosts-rhel8-zseries-latest tasks: - name: .other-hosts - display_name: Other hosts RHEL8-zseries + display_name: Other hosts RHEL8-zseries latest run_on: - rhel8-zseries-small batchtime: 10080 expansions: VERSION: latest NO_EXT: "1" - - name: other-hosts-rhel8-power8 + - name: other-hosts-rhel8-power8-latest tasks: - name: .other-hosts - display_name: Other hosts RHEL8-POWER8 + display_name: Other hosts RHEL8-POWER8 latest run_on: - rhel8-power-small batchtime: 10080 expansions: VERSION: latest NO_EXT: "1" - - name: other-hosts-rhel8-arm64 + - name: other-hosts-rhel8-arm64-latest tasks: - name: .other-hosts - display_name: Other hosts RHEL8-arm64 + display_name: Other hosts RHEL8-arm64 latest run_on: - rhel82-arm64-small batchtime: 10080 expansions: VERSION: latest NO_EXT: "1" - - name: other-hosts-amazon2023 + - name: other-hosts-amazon2023-latest tasks: - name: .other-hosts - display_name: Other hosts Amazon2023 + display_name: Other hosts Amazon2023 latest run_on: - amazon2023-arm64-latest-large-m8g batchtime: 10080 diff --git a/.evergreen/scripts/generate_config.py b/.evergreen/scripts/generate_config.py index 10e7141985..f1f32beb4a 100644 --- a/.evergreen/scripts/generate_config.py +++ b/.evergreen/scripts/generate_config.py @@ -549,17 +549,19 @@ def create_alternative_hosts_variants(): variants = [] host = HOSTS["rhel7"] + version = "5.0" variants.append( create_variant( [".other-hosts"], - get_variant_name("OpenSSL 1.0.2", host, python=CPYTHONS[0]), + get_variant_name("OpenSSL 1.0.2", host, python=CPYTHONS[0], version=version), host=host, python=CPYTHONS[0], batchtime=batchtime, - expansions=dict(VERSION="5.0", PYTHON_VERSION=CPYTHONS[0]), + expansions=dict(VERSION=version, PYTHON_VERSION=CPYTHONS[0]), ) ) + version = "latest" for host_name in OTHER_HOSTS: expansions = dict(VERSION="latest") handle_c_ext(C_EXTS[0], expansions) @@ -569,7 +571,7 @@ def create_alternative_hosts_variants(): variants.append( create_variant( [".other-hosts"], - display_name=get_variant_name("Other hosts", host), + display_name=get_variant_name("Other hosts", host, version=version), batchtime=batchtime, host=host, expansions=expansions, From f9024018570356f23fda7831e389c6d21fc43347 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Tue, 15 Apr 2025 19:26:12 -0500 Subject: [PATCH 8/9] split up other hosts tests by sync --- .evergreen/generated_configs/tasks.yml | 3 +++ .evergreen/scripts/generate_config.py | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.evergreen/generated_configs/tasks.yml b/.evergreen/generated_configs/tasks.yml index 97db6d8334..4d550246e9 100644 --- a/.evergreen/generated_configs/tasks.yml +++ b/.evergreen/generated_configs/tasks.yml @@ -3096,6 +3096,7 @@ tasks: AUTH: noauth SSL: nossl TOPOLOGY: standalone + TEST_NAME: default_sync tags: [other-hosts, standalone-noauth-nossl] - name: test-noauth-ssl-replica-set commands: @@ -3109,6 +3110,7 @@ tasks: AUTH: noauth SSL: ssl TOPOLOGY: replica_set + TEST_NAME: default_async tags: [other-hosts, replica_set-noauth-ssl] - name: test-auth-ssl-sharded-cluster commands: @@ -3122,6 +3124,7 @@ tasks: AUTH: auth SSL: ssl TOPOLOGY: sharded_cluster + TEST_NAME: default_sync tags: [other-hosts, sharded_cluster-auth-ssl] # Perf tests diff --git a/.evergreen/scripts/generate_config.py b/.evergreen/scripts/generate_config.py index f1f32beb4a..87750120a1 100644 --- a/.evergreen/scripts/generate_config.py +++ b/.evergreen/scripts/generate_config.py @@ -619,7 +619,7 @@ def create_server_version_tasks(): def create_other_hosts_tasks(): tasks = [] - for topology in TOPOLOGIES: + for topology, sync in zip_cycle(TOPOLOGIES, SYNCS): auth, ssl = get_standard_auth_ssl(topology) tags = [ "other-hosts", @@ -629,6 +629,7 @@ def create_other_hosts_tasks(): name = get_task_name("test", **expansions) server_func = FunctionCall(func="run server", vars=expansions) test_vars = expansions.copy() + test_vars["TEST_NAME"] = f"default_{sync}" test_func = FunctionCall(func="run tests", vars=test_vars) tasks.append(EvgTask(name=name, tags=tags, commands=[server_func, test_func])) return tasks From 85b58a99a91ca5b3e4839c790b66019adf3d4bb8 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Tue, 15 Apr 2025 19:27:27 -0500 Subject: [PATCH 9/9] update task names --- .evergreen/generated_configs/tasks.yml | 6 +++--- .evergreen/scripts/generate_config.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.evergreen/generated_configs/tasks.yml b/.evergreen/generated_configs/tasks.yml index 4d550246e9..fddd725af6 100644 --- a/.evergreen/generated_configs/tasks.yml +++ b/.evergreen/generated_configs/tasks.yml @@ -3084,7 +3084,7 @@ tasks: tags: [auth_oidc, auth_oidc_remote] # Other hosts tests - - name: test-noauth-nossl-standalone + - name: test-sync-noauth-nossl-standalone commands: - func: run server vars: @@ -3098,7 +3098,7 @@ tasks: TOPOLOGY: standalone TEST_NAME: default_sync tags: [other-hosts, standalone-noauth-nossl] - - name: test-noauth-ssl-replica-set + - name: test-async-noauth-ssl-replica-set commands: - func: run server vars: @@ -3112,7 +3112,7 @@ tasks: TOPOLOGY: replica_set TEST_NAME: default_async tags: [other-hosts, replica_set-noauth-ssl] - - name: test-auth-ssl-sharded-cluster + - name: test-sync-auth-ssl-sharded-cluster commands: - func: run server vars: diff --git a/.evergreen/scripts/generate_config.py b/.evergreen/scripts/generate_config.py index 87750120a1..ebdbdd9669 100644 --- a/.evergreen/scripts/generate_config.py +++ b/.evergreen/scripts/generate_config.py @@ -626,7 +626,7 @@ def create_other_hosts_tasks(): f"{topology}-{auth}-{ssl}", ] expansions = dict(AUTH=auth, SSL=ssl, TOPOLOGY=topology) - name = get_task_name("test", **expansions) + name = get_task_name("test", sync=sync, **expansions) server_func = FunctionCall(func="run server", vars=expansions) test_vars = expansions.copy() test_vars["TEST_NAME"] = f"default_{sync}"