From 41c0ff9e0eddb19f4f5020f31b7a80a338867815 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Fri, 2 May 2025 10:45:55 -0500 Subject: [PATCH 01/12] PYTHON-5372 Convert Remaining Variants to Use Common Tasks --- .evergreen/generated_configs/tasks.yml | 106 ---------------------- .evergreen/generated_configs/variants.yml | 38 ++++---- .evergreen/scripts/generate_config.py | 71 +++++---------- 3 files changed, 38 insertions(+), 177 deletions(-) diff --git a/.evergreen/generated_configs/tasks.yml b/.evergreen/generated_configs/tasks.yml index 32e139c2df..ab3855ed6f 100644 --- a/.evergreen/generated_configs/tasks.yml +++ b/.evergreen/generated_configs/tasks.yml @@ -136,50 +136,6 @@ tasks: depends_on: [{ name: .server-version, variant: .coverage_tag, status: "*", patch_optional: true }] tags: [coverage] - # Enterprise auth tests - - name: test-enterprise-auth-python3.9 - commands: - - func: run server - vars: - TEST_NAME: enterprise_auth - AUTH: auth - PYTHON_VERSION: "3.9" - - func: assume ec2 role - - func: run tests - vars: - TEST_NAME: enterprise_auth - AUTH: auth - PYTHON_VERSION: "3.9" - tags: [enterprise_auth] - - name: test-enterprise-auth-python3.13 - commands: - - func: run server - vars: - TEST_NAME: enterprise_auth - AUTH: auth - PYTHON_VERSION: "3.13" - - func: assume ec2 role - - func: run tests - vars: - TEST_NAME: enterprise_auth - AUTH: auth - PYTHON_VERSION: "3.13" - tags: [enterprise_auth] - - name: test-enterprise-auth-pypy3.10 - commands: - - func: run server - vars: - TEST_NAME: enterprise_auth - AUTH: auth - PYTHON_VERSION: pypy3.10 - - func: assume ec2 role - - func: run tests - vars: - TEST_NAME: enterprise_auth - AUTH: auth - PYTHON_VERSION: pypy3.10 - tags: [enterprise_auth, pypy] - # Free threading tests - name: test-free-threading commands: @@ -243,68 +199,6 @@ tasks: TEST_NAME: kms SUB_TEST_NAME: azure-fail - # Mod wsgi tests - - name: mod-wsgi-replica-set-python3.9 - commands: - - func: run server - vars: - TOPOLOGY: replica_set - PYTHON_VERSION: "3.9" - - func: run tests - vars: - TEST_NAME: mod_wsgi - SUB_TEST_NAME: standalone - PYTHON_VERSION: "3.9" - tags: [mod_wsgi] - - name: mod-wsgi-embedded-mode-replica-set-python3.10 - commands: - - func: run server - vars: - TOPOLOGY: replica_set - PYTHON_VERSION: "3.10" - - func: run tests - vars: - TEST_NAME: mod_wsgi - SUB_TEST_NAME: embedded - PYTHON_VERSION: "3.10" - tags: [mod_wsgi] - - name: mod-wsgi-replica-set-python3.11 - commands: - - func: run server - vars: - TOPOLOGY: replica_set - PYTHON_VERSION: "3.11" - - func: run tests - vars: - TEST_NAME: mod_wsgi - SUB_TEST_NAME: standalone - PYTHON_VERSION: "3.11" - tags: [mod_wsgi] - - name: mod-wsgi-embedded-mode-replica-set-python3.12 - commands: - - func: run server - vars: - TOPOLOGY: replica_set - PYTHON_VERSION: "3.12" - - func: run tests - vars: - TEST_NAME: mod_wsgi - SUB_TEST_NAME: embedded - PYTHON_VERSION: "3.12" - tags: [mod_wsgi] - - name: mod-wsgi-replica-set-python3.13 - commands: - - func: run server - vars: - TOPOLOGY: replica_set - PYTHON_VERSION: "3.13" - - func: run tests - vars: - TEST_NAME: mod_wsgi - SUB_TEST_NAME: standalone - PYTHON_VERSION: "3.13" - tags: [mod_wsgi] - # No orchestration tests - name: test-no-orchestration-python3.9 commands: diff --git a/.evergreen/generated_configs/variants.yml b/.evergreen/generated_configs/variants.yml index 45266f0dff..7799464952 100644 --- a/.evergreen/generated_configs/variants.yml +++ b/.evergreen/generated_configs/variants.yml @@ -251,24 +251,6 @@ buildvariants: tags: [encryption_tag] # Enterprise auth tests - - name: auth-enterprise-macos - tasks: - - name: .enterprise_auth !.pypy - display_name: Auth Enterprise macOS - run_on: - - macos-14 - - name: auth-enterprise-win64 - tasks: - - name: .enterprise_auth !.pypy - display_name: Auth Enterprise Win64 - run_on: - - windows-64-vsMulti-small - - name: auth-enterprise-rhel8 - tasks: - - name: .enterprise_auth - display_name: Auth Enterprise RHEL8 - run_on: - - rhel87-small # Free threaded tests - name: free-threaded-rhel8-python3.13t @@ -365,14 +347,28 @@ buildvariants: TEST_NAME: mockupdb # Mod wsgi tests - - name: mod_wsgi-ubuntu-22 + - name: mod_wsgi-standalone-ubuntu-22 + tasks: + - name: .test-non-standard .replica_set + - name: .test-non-standard .standalone + display_name: mod_wsgi standalone Ubuntu-22 + run_on: + - ubuntu2204-small + expansions: + MOD_WSGI_VERSION: "4" + TEST_NAME: mode_wsgi + SUB_TEST_NAME: standalone + - name: mod_wsgi-embedded-mode-ubuntu-22 tasks: - - name: .mod_wsgi - display_name: mod_wsgi Ubuntu-22 + - name: .test-non-standard .replica_set + - name: .test-non-standard .standalone + display_name: mod_wsgi embedded-mode Ubuntu-22 run_on: - ubuntu2204-small expansions: MOD_WSGI_VERSION: "4" + TEST_NAME: mode_wsgi + SUB_TEST_NAME: embedded # No c ext tests - name: no-c-ext-rhel8 diff --git a/.evergreen/scripts/generate_config.py b/.evergreen/scripts/generate_config.py index b92e957143..bdc12da41a 100644 --- a/.evergreen/scripts/generate_config.py +++ b/.evergreen/scripts/generate_config.py @@ -211,17 +211,15 @@ def create_compression_variants(): def create_enterprise_auth_variants(): variants = [] - for host in [HOSTS["macos"], HOSTS["win64"], DEFAULT_HOST]: + for host in ["rhel8", "macos", "win64"]: + expansions = dict(TEST_NAME="enterprise_auth", AUTH="auth") display_name = get_variant_name("Auth Enterprise", host) - if host == DEFAULT_HOST: - tags = [".enterprise_auth"] - else: - tags = [".enterprise_auth !.pypy"] - variant = create_variant(tags, display_name, host=host) + tasks = [".test-non-standard"] + if host != "rhel8": + tasks = [".test-non-standard !.pypy"] + variant = create_variant(tasks, display_name, host=host, expansions=expansions) variants.append(variant) - return variants - def create_pyopenssl_variants(): base_name = "PyOpenSSL" @@ -336,10 +334,21 @@ def create_atlas_data_lake_variants(): def create_mod_wsgi_variants(): host = HOSTS["ubuntu22"] - tasks = [".mod_wsgi"] - expansions = dict(MOD_WSGI_VERSION="4") - display_name = get_variant_name("mod_wsgi", host) - return [create_variant(tasks, display_name, host=host, expansions=expansions)] + variants = [] + for test_type in ["standalone", "embedded-mode"]: + expansions = dict( + MOD_WSGI_VERSION="4", TEST_NAME="mode_wsgi", SUB_TEST_NAME=test_type.split("-")[0] + ) + display_name = get_variant_name(f"mod_wsgi {test_type}", host) + variants.append( + create_variant( + [".test-non-standard .replica_set", ".test-non-standard .standalone"], + display_name, + host=host, + expansions=expansions, + ) + ) + return variants def create_disable_test_commands_variants(): @@ -743,27 +752,6 @@ def create_oidc_tasks(): return tasks -def create_mod_wsgi_tasks(): - tasks = [] - for (test, topology), python in zip_cycle( - product(["standalone", "embedded-mode"], ["standalone", "replica_set"]), CPYTHONS - ): - if test == "standalone": - task_name = "mod-wsgi-" - else: - task_name = "mod-wsgi-embedded-mode-" - task_name += topology.replace("_", "-") - task_name = get_task_name(task_name, python=python) - server_vars = dict(TOPOLOGY=topology, PYTHON_VERSION=python) - server_func = FunctionCall(func="run server", vars=server_vars) - vars = dict(TEST_NAME="mod_wsgi", SUB_TEST_NAME=test.split("-")[0], PYTHON_VERSION=python) - test_func = FunctionCall(func="run tests", vars=vars) - tags = ["mod_wsgi"] - commands = [server_func, test_func] - tasks.append(EvgTask(name=task_name, tags=tags, commands=commands)) - return tasks - - def _create_ocsp_tasks(algo, variant, server_type, base_task_name): tasks = [] file_name = f"{algo}-basic-tls-ocsp-{variant}.json" @@ -815,23 +803,6 @@ def create_search_index_tasks(): return [EvgTask(name=task_name, tags=tags, commands=commands)] -def create_enterprise_auth_tasks(): - tasks = [] - for python in [*MIN_MAX_PYTHON, PYPYS[-1]]: - vars = dict(TEST_NAME="enterprise_auth", AUTH="auth", PYTHON_VERSION=python) - server_func = FunctionCall(func="run server", vars=vars) - assume_func = FunctionCall(func="assume ec2 role") - test_func = FunctionCall(func="run tests", vars=vars) - task_name = get_task_name("test-enterprise-auth", python=python) - tags = ["enterprise_auth"] - if python in PYPYS: - tags += ["pypy"] - tasks.append( - EvgTask(name=task_name, tags=tags, commands=[server_func, assume_func, test_func]) - ) - return tasks - - def create_perf_tasks(): tasks = [] for version, ssl, sync in product(["8.0"], ["ssl", "nossl"], ["sync", "async"]): From cfa5a1fe637c8dd2eed0f87849cf2a5bb8cd32e2 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Fri, 2 May 2025 10:46:34 -0500 Subject: [PATCH 02/12] PYTHON-5372 Convert Remaining Variants to Use Common Tasks --- .evergreen/generated_configs/variants.yml | 8 ++++---- .evergreen/scripts/generate_config.py | 5 ++++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.evergreen/generated_configs/variants.yml b/.evergreen/generated_configs/variants.yml index 7799464952..8c26577189 100644 --- a/.evergreen/generated_configs/variants.yml +++ b/.evergreen/generated_configs/variants.yml @@ -349,8 +349,8 @@ buildvariants: # Mod wsgi tests - name: mod_wsgi-standalone-ubuntu-22 tasks: - - name: .test-non-standard .replica_set - - name: .test-non-standard .standalone + - name: .test-non-standard .replica_set-noauth-ssl + - name: .test-non-standard .standalone-noauth-nossl display_name: mod_wsgi standalone Ubuntu-22 run_on: - ubuntu2204-small @@ -360,8 +360,8 @@ buildvariants: SUB_TEST_NAME: standalone - name: mod_wsgi-embedded-mode-ubuntu-22 tasks: - - name: .test-non-standard .replica_set - - name: .test-non-standard .standalone + - name: .test-non-standard .replica_set-noauth-ssl + - name: .test-non-standard .standalone-noauth-nossl display_name: mod_wsgi embedded-mode Ubuntu-22 run_on: - ubuntu2204-small diff --git a/.evergreen/scripts/generate_config.py b/.evergreen/scripts/generate_config.py index bdc12da41a..440125f022 100644 --- a/.evergreen/scripts/generate_config.py +++ b/.evergreen/scripts/generate_config.py @@ -342,7 +342,10 @@ def create_mod_wsgi_variants(): display_name = get_variant_name(f"mod_wsgi {test_type}", host) variants.append( create_variant( - [".test-non-standard .replica_set", ".test-non-standard .standalone"], + [ + ".test-non-standard .replica_set-noauth-ssl", + ".test-non-standard .standalone-noauth-nossl", + ], display_name, host=host, expansions=expansions, From c068a1f808bd24f4c4440063984e1b127669fc1e Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Fri, 2 May 2025 10:46:51 -0500 Subject: [PATCH 03/12] PYTHON-5372 Convert Remaining Variants to Use Common Tasks --- .evergreen/generated_configs/variants.yml | 4 ++-- .evergreen/scripts/generate_config.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.evergreen/generated_configs/variants.yml b/.evergreen/generated_configs/variants.yml index 8c26577189..027dbd09cf 100644 --- a/.evergreen/generated_configs/variants.yml +++ b/.evergreen/generated_configs/variants.yml @@ -356,7 +356,7 @@ buildvariants: - ubuntu2204-small expansions: MOD_WSGI_VERSION: "4" - TEST_NAME: mode_wsgi + TEST_NAME: mod_wsgi SUB_TEST_NAME: standalone - name: mod_wsgi-embedded-mode-ubuntu-22 tasks: @@ -367,7 +367,7 @@ buildvariants: - ubuntu2204-small expansions: MOD_WSGI_VERSION: "4" - TEST_NAME: mode_wsgi + TEST_NAME: mod_wsgi SUB_TEST_NAME: embedded # No c ext tests diff --git a/.evergreen/scripts/generate_config.py b/.evergreen/scripts/generate_config.py index 440125f022..9600a4afe2 100644 --- a/.evergreen/scripts/generate_config.py +++ b/.evergreen/scripts/generate_config.py @@ -337,7 +337,7 @@ def create_mod_wsgi_variants(): variants = [] for test_type in ["standalone", "embedded-mode"]: expansions = dict( - MOD_WSGI_VERSION="4", TEST_NAME="mode_wsgi", SUB_TEST_NAME=test_type.split("-")[0] + MOD_WSGI_VERSION="4", TEST_NAME="mod_wsgi", SUB_TEST_NAME=test_type.split("-")[0] ) display_name = get_variant_name(f"mod_wsgi {test_type}", host) variants.append( From f118492592a38c855e375e4dd50693abe918d4b0 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Fri, 2 May 2025 10:47:25 -0500 Subject: [PATCH 04/12] PYTHON-5372 Convert Remaining Variants to Use Common Tasks --- .evergreen/generated_configs/variants.yml | 27 +++++++++++++++++++++++ .evergreen/scripts/generate_config.py | 1 + 2 files changed, 28 insertions(+) diff --git a/.evergreen/generated_configs/variants.yml b/.evergreen/generated_configs/variants.yml index 027dbd09cf..d323190b11 100644 --- a/.evergreen/generated_configs/variants.yml +++ b/.evergreen/generated_configs/variants.yml @@ -251,6 +251,33 @@ buildvariants: tags: [encryption_tag] # Enterprise auth tests + - name: auth-enterprise-rhel8 + tasks: + - name: .test-non-standard + display_name: Auth Enterprise RHEL8 + run_on: + - rhel87-small + expansions: + TEST_NAME: enterprise_auth + AUTH: auth + - name: auth-enterprise-macos + tasks: + - name: .test-non-standard !.pypy + display_name: Auth Enterprise macOS + run_on: + - macos-14 + expansions: + TEST_NAME: enterprise_auth + AUTH: auth + - name: auth-enterprise-win64 + tasks: + - name: .test-non-standard !.pypy + display_name: Auth Enterprise Win64 + run_on: + - windows-64-vsMulti-small + expansions: + TEST_NAME: enterprise_auth + AUTH: auth # Free threaded tests - name: free-threaded-rhel8-python3.13t diff --git a/.evergreen/scripts/generate_config.py b/.evergreen/scripts/generate_config.py index 9600a4afe2..b928afd1df 100644 --- a/.evergreen/scripts/generate_config.py +++ b/.evergreen/scripts/generate_config.py @@ -219,6 +219,7 @@ def create_enterprise_auth_variants(): tasks = [".test-non-standard !.pypy"] variant = create_variant(tasks, display_name, host=host, expansions=expansions) variants.append(variant) + return variants def create_pyopenssl_variants(): From 88b080ed0e4f8f24989acea093acab3c055210c5 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Fri, 2 May 2025 10:48:44 -0500 Subject: [PATCH 05/12] PYTHON-5372 Convert Remaining Variants to Use Common Tasks --- .evergreen/generated_configs/tasks.yml | 36 +++++++++++++++++++++++ .evergreen/generated_configs/variants.yml | 4 +-- .evergreen/scripts/generate_config.py | 3 +- 3 files changed, 40 insertions(+), 3 deletions(-) diff --git a/.evergreen/generated_configs/tasks.yml b/.evergreen/generated_configs/tasks.yml index ab3855ed6f..22ceb0a3a6 100644 --- a/.evergreen/generated_configs/tasks.yml +++ b/.evergreen/generated_configs/tasks.yml @@ -3822,6 +3822,7 @@ tasks: - server-4.0 - python-3.9 - standalone-noauth-nossl + - noauth - name: test-non-standard-v4.0-python3.10-noauth-ssl-replica-set commands: - func: run server @@ -3842,6 +3843,7 @@ tasks: - server-4.0 - python-3.10 - replica_set-noauth-ssl + - noauth - name: test-non-standard-v4.0-python3.11-auth-ssl-sharded-cluster commands: - func: run server @@ -3862,6 +3864,7 @@ tasks: - server-4.0 - python-3.11 - sharded_cluster-auth-ssl + - auth - name: test-non-standard-v4.2-python3.12-noauth-nossl-standalone commands: - func: run server @@ -3882,6 +3885,7 @@ tasks: - server-4.2 - python-3.12 - standalone-noauth-nossl + - noauth - name: test-non-standard-v4.2-python3.13-noauth-ssl-replica-set commands: - func: run server @@ -3902,6 +3906,7 @@ tasks: - server-4.2 - python-3.13 - replica_set-noauth-ssl + - noauth - name: test-non-standard-v4.2-python3.9-auth-ssl-sharded-cluster commands: - func: run server @@ -3922,6 +3927,7 @@ tasks: - server-4.2 - python-3.9 - sharded_cluster-auth-ssl + - auth - name: test-non-standard-v4.4-python3.10-noauth-nossl-standalone commands: - func: run server @@ -3942,6 +3948,7 @@ tasks: - server-4.4 - python-3.10 - standalone-noauth-nossl + - noauth - name: test-non-standard-v4.4-python3.11-noauth-ssl-replica-set commands: - func: run server @@ -3962,6 +3969,7 @@ tasks: - server-4.4 - python-3.11 - replica_set-noauth-ssl + - noauth - name: test-non-standard-v4.4-python3.12-auth-ssl-sharded-cluster commands: - func: run server @@ -3982,6 +3990,7 @@ tasks: - server-4.4 - python-3.12 - sharded_cluster-auth-ssl + - auth - name: test-non-standard-v5.0-python3.13-noauth-nossl-standalone commands: - func: run server @@ -4002,6 +4011,7 @@ tasks: - server-5.0 - python-3.13 - standalone-noauth-nossl + - noauth - name: test-non-standard-v5.0-python3.9-noauth-ssl-replica-set commands: - func: run server @@ -4022,6 +4032,7 @@ tasks: - server-5.0 - python-3.9 - replica_set-noauth-ssl + - noauth - name: test-non-standard-v5.0-python3.10-auth-ssl-sharded-cluster commands: - func: run server @@ -4042,6 +4053,7 @@ tasks: - server-5.0 - python-3.10 - sharded_cluster-auth-ssl + - auth - name: test-non-standard-v6.0-python3.11-noauth-nossl-standalone commands: - func: run server @@ -4062,6 +4074,7 @@ tasks: - server-6.0 - python-3.11 - standalone-noauth-nossl + - noauth - name: test-non-standard-v6.0-python3.12-noauth-ssl-replica-set commands: - func: run server @@ -4082,6 +4095,7 @@ tasks: - server-6.0 - python-3.12 - replica_set-noauth-ssl + - noauth - name: test-non-standard-v6.0-python3.13-auth-ssl-sharded-cluster commands: - func: run server @@ -4102,6 +4116,7 @@ tasks: - server-6.0 - python-3.13 - sharded_cluster-auth-ssl + - auth - name: test-non-standard-v7.0-python3.9-noauth-nossl-standalone commands: - func: run server @@ -4122,6 +4137,7 @@ tasks: - server-7.0 - python-3.9 - standalone-noauth-nossl + - noauth - name: test-non-standard-v7.0-python3.10-noauth-ssl-replica-set commands: - func: run server @@ -4142,6 +4158,7 @@ tasks: - server-7.0 - python-3.10 - replica_set-noauth-ssl + - noauth - name: test-non-standard-v7.0-python3.11-auth-ssl-sharded-cluster commands: - func: run server @@ -4162,6 +4179,7 @@ tasks: - server-7.0 - python-3.11 - sharded_cluster-auth-ssl + - auth - name: test-non-standard-v8.0-python3.12-noauth-nossl-standalone commands: - func: run server @@ -4182,6 +4200,7 @@ tasks: - server-8.0 - python-3.12 - standalone-noauth-nossl + - noauth - name: test-non-standard-v8.0-python3.13-noauth-ssl-replica-set commands: - func: run server @@ -4202,6 +4221,7 @@ tasks: - server-8.0 - python-3.13 - replica_set-noauth-ssl + - noauth - name: test-non-standard-v8.0-python3.9-auth-ssl-sharded-cluster commands: - func: run server @@ -4222,6 +4242,7 @@ tasks: - server-8.0 - python-3.9 - sharded_cluster-auth-ssl + - auth - name: test-non-standard-rapid-python3.10-noauth-nossl-standalone commands: - func: run server @@ -4242,6 +4263,7 @@ tasks: - server-rapid - python-3.10 - standalone-noauth-nossl + - noauth - name: test-non-standard-rapid-python3.11-noauth-ssl-replica-set commands: - func: run server @@ -4262,6 +4284,7 @@ tasks: - server-rapid - python-3.11 - replica_set-noauth-ssl + - noauth - name: test-non-standard-rapid-python3.12-auth-ssl-sharded-cluster commands: - func: run server @@ -4282,6 +4305,7 @@ tasks: - server-rapid - python-3.12 - sharded_cluster-auth-ssl + - auth - name: test-non-standard-latest-python3.13-noauth-nossl-standalone commands: - func: run server @@ -4302,6 +4326,7 @@ tasks: - server-latest - python-3.13 - standalone-noauth-nossl + - noauth - name: test-non-standard-latest-python3.9-noauth-ssl-replica-set commands: - func: run server @@ -4322,6 +4347,7 @@ tasks: - server-latest - python-3.9 - replica_set-noauth-ssl + - noauth - name: test-non-standard-latest-python3.10-auth-ssl-sharded-cluster commands: - func: run server @@ -4342,6 +4368,7 @@ tasks: - server-latest - python-3.10 - sharded_cluster-auth-ssl + - auth - name: test-non-standard-v4.0-pypy3.10-noauth-nossl-standalone commands: - func: run server @@ -4362,6 +4389,7 @@ tasks: - server-4.0 - python-pypy3.10 - standalone-noauth-nossl + - noauth - pypy - name: test-non-standard-v4.2-pypy3.10-noauth-ssl-replica-set commands: @@ -4383,6 +4411,7 @@ tasks: - server-4.2 - python-pypy3.10 - replica_set-noauth-ssl + - noauth - pypy - name: test-non-standard-v4.4-pypy3.10-auth-ssl-sharded-cluster commands: @@ -4404,6 +4433,7 @@ tasks: - server-4.4 - python-pypy3.10 - sharded_cluster-auth-ssl + - auth - pypy - name: test-non-standard-v5.0-pypy3.10-noauth-nossl-standalone commands: @@ -4425,6 +4455,7 @@ tasks: - server-5.0 - python-pypy3.10 - standalone-noauth-nossl + - noauth - pypy - name: test-non-standard-v6.0-pypy3.10-noauth-ssl-replica-set commands: @@ -4446,6 +4477,7 @@ tasks: - server-6.0 - python-pypy3.10 - replica_set-noauth-ssl + - noauth - pypy - name: test-non-standard-v7.0-pypy3.10-auth-ssl-sharded-cluster commands: @@ -4467,6 +4499,7 @@ tasks: - server-7.0 - python-pypy3.10 - sharded_cluster-auth-ssl + - auth - pypy - name: test-non-standard-v8.0-pypy3.10-noauth-nossl-standalone commands: @@ -4488,6 +4521,7 @@ tasks: - server-8.0 - python-pypy3.10 - standalone-noauth-nossl + - noauth - pypy - name: test-non-standard-rapid-pypy3.10-noauth-ssl-replica-set commands: @@ -4509,6 +4543,7 @@ tasks: - server-rapid - python-pypy3.10 - replica_set-noauth-ssl + - noauth - pypy - name: test-non-standard-latest-pypy3.10-auth-ssl-sharded-cluster commands: @@ -4530,4 +4565,5 @@ tasks: - server-latest - python-pypy3.10 - sharded_cluster-auth-ssl + - auth - pypy diff --git a/.evergreen/generated_configs/variants.yml b/.evergreen/generated_configs/variants.yml index d323190b11..02003e4384 100644 --- a/.evergreen/generated_configs/variants.yml +++ b/.evergreen/generated_configs/variants.yml @@ -262,7 +262,7 @@ buildvariants: AUTH: auth - name: auth-enterprise-macos tasks: - - name: .test-non-standard !.pypy + - name: .test-non-standard !.pypy .auth display_name: Auth Enterprise macOS run_on: - macos-14 @@ -271,7 +271,7 @@ buildvariants: AUTH: auth - name: auth-enterprise-win64 tasks: - - name: .test-non-standard !.pypy + - name: .test-non-standard !.pypy .auth display_name: Auth Enterprise Win64 run_on: - windows-64-vsMulti-small diff --git a/.evergreen/scripts/generate_config.py b/.evergreen/scripts/generate_config.py index b928afd1df..3ff4e1200d 100644 --- a/.evergreen/scripts/generate_config.py +++ b/.evergreen/scripts/generate_config.py @@ -216,7 +216,7 @@ def create_enterprise_auth_variants(): display_name = get_variant_name("Auth Enterprise", host) tasks = [".test-non-standard"] if host != "rhel8": - tasks = [".test-non-standard !.pypy"] + tasks = [".test-non-standard !.pypy .auth"] variant = create_variant(tasks, display_name, host=host, expansions=expansions) variants.append(variant) return variants @@ -618,6 +618,7 @@ def create_test_non_standard_tasks(): f"server-{version}", f"python-{python}", f"{topology}-{auth}-{ssl}", + auth, ] if python in PYPYS: tags.append("pypy") From 5d918eb904b3d667a7f5e17de9ed2ef33d62754b Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Fri, 2 May 2025 10:49:59 -0500 Subject: [PATCH 06/12] PYTHON-5372 Convert Remaining Variants to Use Common Tasks --- .evergreen/generated_configs/variants.yml | 2 +- .evergreen/scripts/generate_config.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.evergreen/generated_configs/variants.yml b/.evergreen/generated_configs/variants.yml index 02003e4384..9ecf6312a3 100644 --- a/.evergreen/generated_configs/variants.yml +++ b/.evergreen/generated_configs/variants.yml @@ -253,7 +253,7 @@ buildvariants: # Enterprise auth tests - name: auth-enterprise-rhel8 tasks: - - name: .test-non-standard + - name: .test-non-standard .auth display_name: Auth Enterprise RHEL8 run_on: - rhel87-small diff --git a/.evergreen/scripts/generate_config.py b/.evergreen/scripts/generate_config.py index 3ff4e1200d..b3b005a56b 100644 --- a/.evergreen/scripts/generate_config.py +++ b/.evergreen/scripts/generate_config.py @@ -214,7 +214,7 @@ def create_enterprise_auth_variants(): for host in ["rhel8", "macos", "win64"]: expansions = dict(TEST_NAME="enterprise_auth", AUTH="auth") display_name = get_variant_name("Auth Enterprise", host) - tasks = [".test-non-standard"] + tasks = [".test-non-standard .auth"] if host != "rhel8": tasks = [".test-non-standard !.pypy .auth"] variant = create_variant(tasks, display_name, host=host, expansions=expansions) From 4f6e0b9dd247ac2d900952af2285f88070277005 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Fri, 2 May 2025 10:53:32 -0500 Subject: [PATCH 07/12] capitalize display names --- .evergreen/generated_configs/variants.yml | 130 ++++++++++---------- .evergreen/scripts/generate_config_utils.py | 2 +- 2 files changed, 66 insertions(+), 66 deletions(-) diff --git a/.evergreen/generated_configs/variants.yml b/.evergreen/generated_configs/variants.yml index 9ecf6312a3..d2ef5f7047 100644 --- a/.evergreen/generated_configs/variants.yml +++ b/.evergreen/generated_configs/variants.yml @@ -3,7 +3,7 @@ buildvariants: - name: openssl-1.0.2-rhel7-v5.0-python3.9 tasks: - name: .test-no-toolchain - display_name: OpenSSL 1.0.2 RHEL7 v5.0 Python3.9 + display_name: Openssl 1.0.2 rhel7 v5.0 python3.9 run_on: - rhel79-small batchtime: 10080 @@ -14,7 +14,7 @@ buildvariants: - name: other-hosts-rhel9-fips-latest tasks: - name: .test-no-toolchain - display_name: Other hosts RHEL9-FIPS latest + display_name: Other hosts rhel9-fips latest run_on: - rhel92-fips batchtime: 10080 @@ -25,7 +25,7 @@ buildvariants: - name: other-hosts-rhel8-zseries-latest tasks: - name: .test-no-toolchain - display_name: Other hosts RHEL8-zseries latest + display_name: Other hosts rhel8-zseries latest run_on: - rhel8-zseries-small batchtime: 10080 @@ -35,7 +35,7 @@ buildvariants: - name: other-hosts-rhel8-power8-latest tasks: - name: .test-no-toolchain - display_name: Other hosts RHEL8-POWER8 latest + display_name: Other hosts rhel8-power8 latest run_on: - rhel8-power-small batchtime: 10080 @@ -45,7 +45,7 @@ buildvariants: - name: other-hosts-rhel8-arm64-latest tasks: - name: .test-no-toolchain - display_name: Other hosts RHEL8-arm64 latest + display_name: Other hosts rhel8-arm64 latest run_on: - rhel82-arm64-small batchtime: 10080 @@ -55,7 +55,7 @@ buildvariants: - name: other-hosts-amazon2023-latest tasks: - name: .test-no-toolchain - display_name: Other hosts Amazon2023 latest + display_name: Other hosts amazon2023 latest run_on: - amazon2023-arm64-latest-large-m8g batchtime: 10080 @@ -67,7 +67,7 @@ buildvariants: - name: atlas-connect-rhel8 tasks: - name: .test-no-orchestration - display_name: Atlas connect RHEL8 + display_name: Atlas connect rhel8 run_on: - rhel87-small @@ -75,7 +75,7 @@ buildvariants: - name: atlas-data-lake-ubuntu-22 tasks: - name: .test-no-orchestration - display_name: Atlas Data Lake Ubuntu-22 + display_name: Atlas data lake ubuntu-22 run_on: - ubuntu2204-small expansions: @@ -85,19 +85,19 @@ buildvariants: - name: auth-aws-ubuntu-20 tasks: - name: .auth-aws - display_name: Auth AWS Ubuntu-20 + display_name: Auth aws ubuntu-20 run_on: - ubuntu2004-small - name: auth-aws-win64 tasks: - name: .auth-aws !.auth-aws-ecs - display_name: Auth AWS Win64 + display_name: Auth aws win64 run_on: - windows-64-vsMulti-small - name: auth-aws-macos tasks: - name: .auth-aws !.auth-aws-web-identity !.auth-aws-ecs !.auth-aws-ec2 - display_name: Auth AWS macOS + display_name: Auth aws macos run_on: - macos-14 @@ -121,7 +121,7 @@ buildvariants: - name: compression-snappy-rhel8 tasks: - name: .test-standard - display_name: Compression snappy RHEL8 + display_name: Compression snappy rhel8 run_on: - rhel87-small expansions: @@ -129,7 +129,7 @@ buildvariants: - name: compression-zlib-rhel8 tasks: - name: .test-standard - display_name: Compression zlib RHEL8 + display_name: Compression zlib rhel8 run_on: - rhel87-small expansions: @@ -137,7 +137,7 @@ buildvariants: - name: compression-zstd-rhel8 tasks: - name: .test-standard !.server-4.0 - display_name: Compression zstd RHEL8 + display_name: Compression zstd rhel8 run_on: - rhel87-small expansions: @@ -155,7 +155,7 @@ buildvariants: - name: disable-test-commands-rhel8-python3.9 tasks: - name: .test-standard .server-latest - display_name: Disable test commands RHEL8 Python3.9 + display_name: Disable test commands rhel8 python3.9 run_on: - rhel87-small expansions: @@ -168,7 +168,7 @@ buildvariants: - name: doctests-rhel8 tasks: - name: .test-non-standard .standalone-noauth-nossl - display_name: Doctests RHEL8 + display_name: Doctests rhel8 run_on: - rhel87-small expansions: @@ -178,7 +178,7 @@ buildvariants: - name: encryption-rhel8 tasks: - name: .test-non-standard - display_name: Encryption RHEL8 + display_name: Encryption rhel8 run_on: - rhel87-small batchtime: 10080 @@ -188,7 +188,7 @@ buildvariants: - name: encryption-macos tasks: - name: .test-non-standard !.pypy - display_name: Encryption macOS + display_name: Encryption macos run_on: - macos-14 batchtime: 10080 @@ -198,7 +198,7 @@ buildvariants: - name: encryption-win64 tasks: - name: .test-non-standard !.pypy - display_name: Encryption Win64 + display_name: Encryption win64 run_on: - windows-64-vsMulti-small batchtime: 10080 @@ -208,7 +208,7 @@ buildvariants: - name: encryption-crypt_shared-rhel8 tasks: - name: .test-non-standard - display_name: Encryption crypt_shared RHEL8 + display_name: Encryption crypt_shared rhel8 run_on: - rhel87-small batchtime: 10080 @@ -219,7 +219,7 @@ buildvariants: - name: encryption-crypt_shared-macos tasks: - name: .test-non-standard !.pypy - display_name: Encryption crypt_shared macOS + display_name: Encryption crypt_shared macos run_on: - macos-14 batchtime: 10080 @@ -230,7 +230,7 @@ buildvariants: - name: encryption-crypt_shared-win64 tasks: - name: .test-non-standard !.pypy - display_name: Encryption crypt_shared Win64 + display_name: Encryption crypt_shared win64 run_on: - windows-64-vsMulti-small batchtime: 10080 @@ -241,7 +241,7 @@ buildvariants: - name: encryption-pyopenssl-rhel8 tasks: - name: .test-non-standard - display_name: Encryption PyOpenSSL RHEL8 + display_name: Encryption pyopenssl rhel8 run_on: - rhel87-small batchtime: 10080 @@ -254,7 +254,7 @@ buildvariants: - name: auth-enterprise-rhel8 tasks: - name: .test-non-standard .auth - display_name: Auth Enterprise RHEL8 + display_name: Auth enterprise rhel8 run_on: - rhel87-small expansions: @@ -263,7 +263,7 @@ buildvariants: - name: auth-enterprise-macos tasks: - name: .test-non-standard !.pypy .auth - display_name: Auth Enterprise macOS + display_name: Auth enterprise macos run_on: - macos-14 expansions: @@ -272,7 +272,7 @@ buildvariants: - name: auth-enterprise-win64 tasks: - name: .test-non-standard !.pypy .auth - display_name: Auth Enterprise Win64 + display_name: Auth enterprise win64 run_on: - windows-64-vsMulti-small expansions: @@ -283,7 +283,7 @@ buildvariants: - name: free-threaded-rhel8-python3.13t tasks: - name: .free-threading - display_name: Free-threaded RHEL8 Python3.13t + display_name: Free-threaded rhel8 python3.13t run_on: - rhel87-small expansions: @@ -291,7 +291,7 @@ buildvariants: - name: free-threaded-macos-python3.13t tasks: - name: .free-threading - display_name: Free-threaded macOS Python3.13t + display_name: Free-threaded macos python3.13t run_on: - macos-14 expansions: @@ -299,7 +299,7 @@ buildvariants: - name: free-threaded-macos-arm64-python3.13t tasks: - name: .free-threading - display_name: Free-threaded macOS Arm64 Python3.13t + display_name: Free-threaded macos arm64 python3.13t run_on: - macos-14-arm64 expansions: @@ -309,7 +309,7 @@ buildvariants: - name: green-eventlet-rhel8 tasks: - name: .test-standard .standalone-noauth-nossl .python-3.9 - display_name: Green Eventlet RHEL8 + display_name: Green eventlet rhel8 run_on: - rhel87-small expansions: @@ -319,7 +319,7 @@ buildvariants: - name: green-gevent-rhel8 tasks: - name: .test-standard .standalone-noauth-nossl - display_name: Green Gevent RHEL8 + display_name: Green gevent rhel8 run_on: - rhel87-small expansions: @@ -367,7 +367,7 @@ buildvariants: - name: mockupdb-rhel8 tasks: - name: .test-no-orchestration - display_name: MockupDB RHEL8 + display_name: Mockupdb rhel8 run_on: - rhel87-small expansions: @@ -378,7 +378,7 @@ buildvariants: tasks: - name: .test-non-standard .replica_set-noauth-ssl - name: .test-non-standard .standalone-noauth-nossl - display_name: mod_wsgi standalone Ubuntu-22 + display_name: Mod_wsgi standalone ubuntu-22 run_on: - ubuntu2204-small expansions: @@ -389,7 +389,7 @@ buildvariants: tasks: - name: .test-non-standard .replica_set-noauth-ssl - name: .test-non-standard .standalone-noauth-nossl - display_name: mod_wsgi embedded-mode Ubuntu-22 + display_name: Mod_wsgi embedded-mode ubuntu-22 run_on: - ubuntu2204-small expansions: @@ -401,7 +401,7 @@ buildvariants: - name: no-c-ext-rhel8 tasks: - name: .test-standard - display_name: No C Ext RHEL8 + display_name: No c ext rhel8 run_on: - rhel87-small @@ -409,7 +409,7 @@ buildvariants: - name: no-server-rhel8 tasks: - name: .test-no-orchestration - display_name: No server RHEL8 + display_name: No server rhel8 run_on: - rhel87-small @@ -417,7 +417,7 @@ buildvariants: - name: ocsp-rhel8 tasks: - name: .ocsp - display_name: OCSP RHEL8 + display_name: Ocsp rhel8 run_on: - rhel87-small batchtime: 10080 @@ -425,7 +425,7 @@ buildvariants: tasks: - name: .ocsp-rsa !.ocsp-staple .latest - name: .ocsp-rsa !.ocsp-staple .4.4 - display_name: OCSP Win64 + display_name: Ocsp win64 run_on: - windows-64-vsMulti-small batchtime: 10080 @@ -433,7 +433,7 @@ buildvariants: tasks: - name: .ocsp-rsa !.ocsp-staple .latest - name: .ocsp-rsa !.ocsp-staple .4.4 - display_name: OCSP macOS + display_name: Ocsp macos run_on: - macos-14 batchtime: 10080 @@ -442,21 +442,21 @@ buildvariants: - name: auth-oidc-ubuntu-22 tasks: - name: .auth_oidc - display_name: Auth OIDC Ubuntu-22 + display_name: Auth oidc ubuntu-22 run_on: - ubuntu2204-small batchtime: 10080 - name: auth-oidc-macos tasks: - name: .auth_oidc !.auth_oidc_remote - display_name: Auth OIDC macOS + display_name: Auth oidc macos run_on: - macos-14 batchtime: 10080 - name: auth-oidc-win64 tasks: - name: .auth_oidc !.auth_oidc_remote - display_name: Auth OIDC Win64 + display_name: Auth oidc win64 run_on: - windows-64-vsMulti-small batchtime: 10080 @@ -475,7 +475,7 @@ buildvariants: tasks: - name: .test-standard .sync - name: .test-standard .async .replica_set-noauth-ssl - display_name: PyOpenSSL RHEL8 + display_name: Pyopenssl rhel8 run_on: - rhel87-small batchtime: 10080 @@ -485,7 +485,7 @@ buildvariants: tasks: - name: .test-standard !.pypy .sync - name: .test-standard !.pypy .async .replica_set-noauth-ssl - display_name: PyOpenSSL macOS + display_name: Pyopenssl macos run_on: - rhel87-small batchtime: 10080 @@ -495,7 +495,7 @@ buildvariants: tasks: - name: .test-standard !.pypy .sync - name: .test-standard !.pypy .async .replica_set-noauth-ssl - display_name: PyOpenSSL Win64 + display_name: Pyopenssl win64 run_on: - rhel87-small batchtime: 10080 @@ -506,7 +506,7 @@ buildvariants: - name: search-index-helpers-rhel8-python3.9 tasks: - name: .search_index - display_name: Search Index Helpers RHEL8 Python3.9 + display_name: Search index helpers rhel8 python3.9 run_on: - rhel87-small expansions: @@ -516,63 +516,63 @@ buildvariants: - name: mongodb-v4.0 tasks: - name: .server-version - display_name: "* MongoDB v4.0" + display_name: "* mongodb v4.0" run_on: - rhel87-small tags: [coverage_tag] - name: mongodb-v4.2 tasks: - name: .server-version - display_name: "* MongoDB v4.2" + display_name: "* mongodb v4.2" run_on: - rhel87-small tags: [coverage_tag] - name: mongodb-v4.4 tasks: - name: .server-version - display_name: "* MongoDB v4.4" + display_name: "* mongodb v4.4" run_on: - rhel87-small tags: [coverage_tag] - name: mongodb-v5.0 tasks: - name: .server-version - display_name: "* MongoDB v5.0" + display_name: "* mongodb v5.0" run_on: - rhel87-small tags: [coverage_tag] - name: mongodb-v6.0 tasks: - name: .server-version - display_name: "* MongoDB v6.0" + display_name: "* mongodb v6.0" run_on: - rhel87-small tags: [coverage_tag] - name: mongodb-v7.0 tasks: - name: .server-version - display_name: "* MongoDB v7.0" + display_name: "* mongodb v7.0" run_on: - rhel87-small tags: [coverage_tag] - name: mongodb-v8.0 tasks: - name: .server-version - display_name: "* MongoDB v8.0" + display_name: "* mongodb v8.0" run_on: - rhel87-small tags: [coverage_tag] - name: mongodb-rapid tasks: - name: .server-version - display_name: "* MongoDB rapid" + display_name: "* mongodb rapid" run_on: - rhel87-small tags: [coverage_tag] - name: mongodb-latest tasks: - name: .server-version - display_name: "* MongoDB latest" + display_name: "* mongodb latest" run_on: - rhel87-small tags: [coverage_tag] @@ -581,7 +581,7 @@ buildvariants: - name: serverless-rhel8-python3.9 tasks: - name: .serverless - display_name: Serverless RHEL8 Python3.9 + display_name: Serverless rhel8 python3.9 run_on: - rhel87-small batchtime: 10080 @@ -590,7 +590,7 @@ buildvariants: - name: serverless-rhel8-python3.13 tasks: - name: .serverless - display_name: Serverless RHEL8 Python3.13 + display_name: Serverless rhel8 python3.13 run_on: - rhel87-small batchtime: 10080 @@ -606,7 +606,7 @@ buildvariants: - name: .test-standard !.replica_set-noauth-ssl .server-8.0 - name: .test-standard !.replica_set-noauth-ssl .server-rapid - name: .test-standard !.replica_set-noauth-ssl .server-latest - display_name: Stable API require v1 RHEL8 Auth + display_name: Stable api require v1 rhel8 auth run_on: - rhel87-small expansions: @@ -622,7 +622,7 @@ buildvariants: - name: .test-standard .server-8.0 .standalone-noauth-nossl - name: .test-standard .server-rapid .standalone-noauth-nossl - name: .test-standard .server-latest .standalone-noauth-nossl - display_name: Stable API accept v2 RHEL8 Auth + display_name: Stable api accept v2 rhel8 auth run_on: - rhel87-small expansions: @@ -634,7 +634,7 @@ buildvariants: - name: test-macos tasks: - name: .test-standard !.pypy - display_name: "* Test macOS" + display_name: "* test macos" run_on: - macos-14 tags: [standard-non-linux] @@ -645,21 +645,21 @@ buildvariants: - name: .test-standard !.pypy .server-8.0 - name: .test-standard !.pypy .server-rapid - name: .test-standard !.pypy .server-latest - display_name: "* Test macOS Arm64" + display_name: "* test macos arm64" run_on: - macos-14-arm64 tags: [standard-non-linux] - name: test-win64 tasks: - name: .test-standard !.pypy - display_name: "* Test Win64" + display_name: "* test win64" run_on: - windows-64-vsMulti-small tags: [standard-non-linux] - name: test-win32 tasks: - name: .test-standard !.pypy - display_name: "* Test Win32" + display_name: "* test win32" run_on: - windows-64-vsMulti-small expansions: @@ -670,7 +670,7 @@ buildvariants: - name: storage-inmemory-rhel8 tasks: - name: .test-standard .standalone-noauth-nossl - display_name: Storage InMemory RHEL8 + display_name: Storage inmemory rhel8 run_on: - rhel87-small expansions: @@ -678,7 +678,7 @@ buildvariants: - name: storage-mmapv1-rhel8 tasks: - name: .test-standard !.sharded_cluster-auth-ssl .server-4.0 - display_name: Storage MMAPv1 RHEL8 + display_name: Storage mmapv1 rhel8 run_on: - rhel87-small expansions: diff --git a/.evergreen/scripts/generate_config_utils.py b/.evergreen/scripts/generate_config_utils.py index ad092983fa..497e76e733 100644 --- a/.evergreen/scripts/generate_config_utils.py +++ b/.evergreen/scripts/generate_config_utils.py @@ -207,7 +207,7 @@ def get_common_name(base: str, sep: str, **kwargs) -> str: else: continue display_name = f"{display_name}{sep}{name}" - return display_name + return display_name.capitalize() def get_variant_name(base: str, host: str | Host | None = None, **kwargs) -> str: From f6f1a94ee53646e3766e40eb8bfceb6ef14af701 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Fri, 2 May 2025 10:53:59 -0500 Subject: [PATCH 08/12] title names --- .evergreen/generated_configs/variants.yml | 130 ++++++++++---------- .evergreen/scripts/generate_config_utils.py | 2 +- 2 files changed, 66 insertions(+), 66 deletions(-) diff --git a/.evergreen/generated_configs/variants.yml b/.evergreen/generated_configs/variants.yml index d2ef5f7047..a1aa9358d7 100644 --- a/.evergreen/generated_configs/variants.yml +++ b/.evergreen/generated_configs/variants.yml @@ -3,7 +3,7 @@ buildvariants: - name: openssl-1.0.2-rhel7-v5.0-python3.9 tasks: - name: .test-no-toolchain - display_name: Openssl 1.0.2 rhel7 v5.0 python3.9 + display_name: Openssl 1.0.2 Rhel7 V5.0 Python3.9 run_on: - rhel79-small batchtime: 10080 @@ -14,7 +14,7 @@ buildvariants: - name: other-hosts-rhel9-fips-latest tasks: - name: .test-no-toolchain - display_name: Other hosts rhel9-fips latest + display_name: Other Hosts Rhel9-Fips Latest run_on: - rhel92-fips batchtime: 10080 @@ -25,7 +25,7 @@ buildvariants: - name: other-hosts-rhel8-zseries-latest tasks: - name: .test-no-toolchain - display_name: Other hosts rhel8-zseries latest + display_name: Other Hosts Rhel8-Zseries Latest run_on: - rhel8-zseries-small batchtime: 10080 @@ -35,7 +35,7 @@ buildvariants: - name: other-hosts-rhel8-power8-latest tasks: - name: .test-no-toolchain - display_name: Other hosts rhel8-power8 latest + display_name: Other Hosts Rhel8-Power8 Latest run_on: - rhel8-power-small batchtime: 10080 @@ -45,7 +45,7 @@ buildvariants: - name: other-hosts-rhel8-arm64-latest tasks: - name: .test-no-toolchain - display_name: Other hosts rhel8-arm64 latest + display_name: Other Hosts Rhel8-Arm64 Latest run_on: - rhel82-arm64-small batchtime: 10080 @@ -55,7 +55,7 @@ buildvariants: - name: other-hosts-amazon2023-latest tasks: - name: .test-no-toolchain - display_name: Other hosts amazon2023 latest + display_name: Other Hosts Amazon2023 Latest run_on: - amazon2023-arm64-latest-large-m8g batchtime: 10080 @@ -67,7 +67,7 @@ buildvariants: - name: atlas-connect-rhel8 tasks: - name: .test-no-orchestration - display_name: Atlas connect rhel8 + display_name: Atlas Connect Rhel8 run_on: - rhel87-small @@ -75,7 +75,7 @@ buildvariants: - name: atlas-data-lake-ubuntu-22 tasks: - name: .test-no-orchestration - display_name: Atlas data lake ubuntu-22 + display_name: Atlas Data Lake Ubuntu-22 run_on: - ubuntu2204-small expansions: @@ -85,19 +85,19 @@ buildvariants: - name: auth-aws-ubuntu-20 tasks: - name: .auth-aws - display_name: Auth aws ubuntu-20 + display_name: Auth Aws Ubuntu-20 run_on: - ubuntu2004-small - name: auth-aws-win64 tasks: - name: .auth-aws !.auth-aws-ecs - display_name: Auth aws win64 + display_name: Auth Aws Win64 run_on: - windows-64-vsMulti-small - name: auth-aws-macos tasks: - name: .auth-aws !.auth-aws-web-identity !.auth-aws-ecs !.auth-aws-ec2 - display_name: Auth aws macos + display_name: Auth Aws Macos run_on: - macos-14 @@ -121,7 +121,7 @@ buildvariants: - name: compression-snappy-rhel8 tasks: - name: .test-standard - display_name: Compression snappy rhel8 + display_name: Compression Snappy Rhel8 run_on: - rhel87-small expansions: @@ -129,7 +129,7 @@ buildvariants: - name: compression-zlib-rhel8 tasks: - name: .test-standard - display_name: Compression zlib rhel8 + display_name: Compression Zlib Rhel8 run_on: - rhel87-small expansions: @@ -137,7 +137,7 @@ buildvariants: - name: compression-zstd-rhel8 tasks: - name: .test-standard !.server-4.0 - display_name: Compression zstd rhel8 + display_name: Compression Zstd Rhel8 run_on: - rhel87-small expansions: @@ -155,7 +155,7 @@ buildvariants: - name: disable-test-commands-rhel8-python3.9 tasks: - name: .test-standard .server-latest - display_name: Disable test commands rhel8 python3.9 + display_name: Disable Test Commands Rhel8 Python3.9 run_on: - rhel87-small expansions: @@ -168,7 +168,7 @@ buildvariants: - name: doctests-rhel8 tasks: - name: .test-non-standard .standalone-noauth-nossl - display_name: Doctests rhel8 + display_name: Doctests Rhel8 run_on: - rhel87-small expansions: @@ -178,7 +178,7 @@ buildvariants: - name: encryption-rhel8 tasks: - name: .test-non-standard - display_name: Encryption rhel8 + display_name: Encryption Rhel8 run_on: - rhel87-small batchtime: 10080 @@ -188,7 +188,7 @@ buildvariants: - name: encryption-macos tasks: - name: .test-non-standard !.pypy - display_name: Encryption macos + display_name: Encryption Macos run_on: - macos-14 batchtime: 10080 @@ -198,7 +198,7 @@ buildvariants: - name: encryption-win64 tasks: - name: .test-non-standard !.pypy - display_name: Encryption win64 + display_name: Encryption Win64 run_on: - windows-64-vsMulti-small batchtime: 10080 @@ -208,7 +208,7 @@ buildvariants: - name: encryption-crypt_shared-rhel8 tasks: - name: .test-non-standard - display_name: Encryption crypt_shared rhel8 + display_name: Encryption Crypt_Shared Rhel8 run_on: - rhel87-small batchtime: 10080 @@ -219,7 +219,7 @@ buildvariants: - name: encryption-crypt_shared-macos tasks: - name: .test-non-standard !.pypy - display_name: Encryption crypt_shared macos + display_name: Encryption Crypt_Shared Macos run_on: - macos-14 batchtime: 10080 @@ -230,7 +230,7 @@ buildvariants: - name: encryption-crypt_shared-win64 tasks: - name: .test-non-standard !.pypy - display_name: Encryption crypt_shared win64 + display_name: Encryption Crypt_Shared Win64 run_on: - windows-64-vsMulti-small batchtime: 10080 @@ -241,7 +241,7 @@ buildvariants: - name: encryption-pyopenssl-rhel8 tasks: - name: .test-non-standard - display_name: Encryption pyopenssl rhel8 + display_name: Encryption Pyopenssl Rhel8 run_on: - rhel87-small batchtime: 10080 @@ -254,7 +254,7 @@ buildvariants: - name: auth-enterprise-rhel8 tasks: - name: .test-non-standard .auth - display_name: Auth enterprise rhel8 + display_name: Auth Enterprise Rhel8 run_on: - rhel87-small expansions: @@ -263,7 +263,7 @@ buildvariants: - name: auth-enterprise-macos tasks: - name: .test-non-standard !.pypy .auth - display_name: Auth enterprise macos + display_name: Auth Enterprise Macos run_on: - macos-14 expansions: @@ -272,7 +272,7 @@ buildvariants: - name: auth-enterprise-win64 tasks: - name: .test-non-standard !.pypy .auth - display_name: Auth enterprise win64 + display_name: Auth Enterprise Win64 run_on: - windows-64-vsMulti-small expansions: @@ -283,7 +283,7 @@ buildvariants: - name: free-threaded-rhel8-python3.13t tasks: - name: .free-threading - display_name: Free-threaded rhel8 python3.13t + display_name: Free-Threaded Rhel8 Python3.13T run_on: - rhel87-small expansions: @@ -291,7 +291,7 @@ buildvariants: - name: free-threaded-macos-python3.13t tasks: - name: .free-threading - display_name: Free-threaded macos python3.13t + display_name: Free-Threaded Macos Python3.13T run_on: - macos-14 expansions: @@ -299,7 +299,7 @@ buildvariants: - name: free-threaded-macos-arm64-python3.13t tasks: - name: .free-threading - display_name: Free-threaded macos arm64 python3.13t + display_name: Free-Threaded Macos Arm64 Python3.13T run_on: - macos-14-arm64 expansions: @@ -309,7 +309,7 @@ buildvariants: - name: green-eventlet-rhel8 tasks: - name: .test-standard .standalone-noauth-nossl .python-3.9 - display_name: Green eventlet rhel8 + display_name: Green Eventlet Rhel8 run_on: - rhel87-small expansions: @@ -319,7 +319,7 @@ buildvariants: - name: green-gevent-rhel8 tasks: - name: .test-standard .standalone-noauth-nossl - display_name: Green gevent rhel8 + display_name: Green Gevent Rhel8 run_on: - rhel87-small expansions: @@ -367,7 +367,7 @@ buildvariants: - name: mockupdb-rhel8 tasks: - name: .test-no-orchestration - display_name: Mockupdb rhel8 + display_name: Mockupdb Rhel8 run_on: - rhel87-small expansions: @@ -378,7 +378,7 @@ buildvariants: tasks: - name: .test-non-standard .replica_set-noauth-ssl - name: .test-non-standard .standalone-noauth-nossl - display_name: Mod_wsgi standalone ubuntu-22 + display_name: Mod_Wsgi Standalone Ubuntu-22 run_on: - ubuntu2204-small expansions: @@ -389,7 +389,7 @@ buildvariants: tasks: - name: .test-non-standard .replica_set-noauth-ssl - name: .test-non-standard .standalone-noauth-nossl - display_name: Mod_wsgi embedded-mode ubuntu-22 + display_name: Mod_Wsgi Embedded-Mode Ubuntu-22 run_on: - ubuntu2204-small expansions: @@ -401,7 +401,7 @@ buildvariants: - name: no-c-ext-rhel8 tasks: - name: .test-standard - display_name: No c ext rhel8 + display_name: No C Ext Rhel8 run_on: - rhel87-small @@ -409,7 +409,7 @@ buildvariants: - name: no-server-rhel8 tasks: - name: .test-no-orchestration - display_name: No server rhel8 + display_name: No Server Rhel8 run_on: - rhel87-small @@ -417,7 +417,7 @@ buildvariants: - name: ocsp-rhel8 tasks: - name: .ocsp - display_name: Ocsp rhel8 + display_name: Ocsp Rhel8 run_on: - rhel87-small batchtime: 10080 @@ -425,7 +425,7 @@ buildvariants: tasks: - name: .ocsp-rsa !.ocsp-staple .latest - name: .ocsp-rsa !.ocsp-staple .4.4 - display_name: Ocsp win64 + display_name: Ocsp Win64 run_on: - windows-64-vsMulti-small batchtime: 10080 @@ -433,7 +433,7 @@ buildvariants: tasks: - name: .ocsp-rsa !.ocsp-staple .latest - name: .ocsp-rsa !.ocsp-staple .4.4 - display_name: Ocsp macos + display_name: Ocsp Macos run_on: - macos-14 batchtime: 10080 @@ -442,21 +442,21 @@ buildvariants: - name: auth-oidc-ubuntu-22 tasks: - name: .auth_oidc - display_name: Auth oidc ubuntu-22 + display_name: Auth Oidc Ubuntu-22 run_on: - ubuntu2204-small batchtime: 10080 - name: auth-oidc-macos tasks: - name: .auth_oidc !.auth_oidc_remote - display_name: Auth oidc macos + display_name: Auth Oidc Macos run_on: - macos-14 batchtime: 10080 - name: auth-oidc-win64 tasks: - name: .auth_oidc !.auth_oidc_remote - display_name: Auth oidc win64 + display_name: Auth Oidc Win64 run_on: - windows-64-vsMulti-small batchtime: 10080 @@ -475,7 +475,7 @@ buildvariants: tasks: - name: .test-standard .sync - name: .test-standard .async .replica_set-noauth-ssl - display_name: Pyopenssl rhel8 + display_name: Pyopenssl Rhel8 run_on: - rhel87-small batchtime: 10080 @@ -485,7 +485,7 @@ buildvariants: tasks: - name: .test-standard !.pypy .sync - name: .test-standard !.pypy .async .replica_set-noauth-ssl - display_name: Pyopenssl macos + display_name: Pyopenssl Macos run_on: - rhel87-small batchtime: 10080 @@ -495,7 +495,7 @@ buildvariants: tasks: - name: .test-standard !.pypy .sync - name: .test-standard !.pypy .async .replica_set-noauth-ssl - display_name: Pyopenssl win64 + display_name: Pyopenssl Win64 run_on: - rhel87-small batchtime: 10080 @@ -506,7 +506,7 @@ buildvariants: - name: search-index-helpers-rhel8-python3.9 tasks: - name: .search_index - display_name: Search index helpers rhel8 python3.9 + display_name: Search Index Helpers Rhel8 Python3.9 run_on: - rhel87-small expansions: @@ -516,63 +516,63 @@ buildvariants: - name: mongodb-v4.0 tasks: - name: .server-version - display_name: "* mongodb v4.0" + display_name: "* Mongodb V4.0" run_on: - rhel87-small tags: [coverage_tag] - name: mongodb-v4.2 tasks: - name: .server-version - display_name: "* mongodb v4.2" + display_name: "* Mongodb V4.2" run_on: - rhel87-small tags: [coverage_tag] - name: mongodb-v4.4 tasks: - name: .server-version - display_name: "* mongodb v4.4" + display_name: "* Mongodb V4.4" run_on: - rhel87-small tags: [coverage_tag] - name: mongodb-v5.0 tasks: - name: .server-version - display_name: "* mongodb v5.0" + display_name: "* Mongodb V5.0" run_on: - rhel87-small tags: [coverage_tag] - name: mongodb-v6.0 tasks: - name: .server-version - display_name: "* mongodb v6.0" + display_name: "* Mongodb V6.0" run_on: - rhel87-small tags: [coverage_tag] - name: mongodb-v7.0 tasks: - name: .server-version - display_name: "* mongodb v7.0" + display_name: "* Mongodb V7.0" run_on: - rhel87-small tags: [coverage_tag] - name: mongodb-v8.0 tasks: - name: .server-version - display_name: "* mongodb v8.0" + display_name: "* Mongodb V8.0" run_on: - rhel87-small tags: [coverage_tag] - name: mongodb-rapid tasks: - name: .server-version - display_name: "* mongodb rapid" + display_name: "* Mongodb Rapid" run_on: - rhel87-small tags: [coverage_tag] - name: mongodb-latest tasks: - name: .server-version - display_name: "* mongodb latest" + display_name: "* Mongodb Latest" run_on: - rhel87-small tags: [coverage_tag] @@ -581,7 +581,7 @@ buildvariants: - name: serverless-rhel8-python3.9 tasks: - name: .serverless - display_name: Serverless rhel8 python3.9 + display_name: Serverless Rhel8 Python3.9 run_on: - rhel87-small batchtime: 10080 @@ -590,7 +590,7 @@ buildvariants: - name: serverless-rhel8-python3.13 tasks: - name: .serverless - display_name: Serverless rhel8 python3.13 + display_name: Serverless Rhel8 Python3.13 run_on: - rhel87-small batchtime: 10080 @@ -606,7 +606,7 @@ buildvariants: - name: .test-standard !.replica_set-noauth-ssl .server-8.0 - name: .test-standard !.replica_set-noauth-ssl .server-rapid - name: .test-standard !.replica_set-noauth-ssl .server-latest - display_name: Stable api require v1 rhel8 auth + display_name: Stable Api Require V1 Rhel8 Auth run_on: - rhel87-small expansions: @@ -622,7 +622,7 @@ buildvariants: - name: .test-standard .server-8.0 .standalone-noauth-nossl - name: .test-standard .server-rapid .standalone-noauth-nossl - name: .test-standard .server-latest .standalone-noauth-nossl - display_name: Stable api accept v2 rhel8 auth + display_name: Stable Api Accept V2 Rhel8 Auth run_on: - rhel87-small expansions: @@ -634,7 +634,7 @@ buildvariants: - name: test-macos tasks: - name: .test-standard !.pypy - display_name: "* test macos" + display_name: "* Test Macos" run_on: - macos-14 tags: [standard-non-linux] @@ -645,21 +645,21 @@ buildvariants: - name: .test-standard !.pypy .server-8.0 - name: .test-standard !.pypy .server-rapid - name: .test-standard !.pypy .server-latest - display_name: "* test macos arm64" + display_name: "* Test Macos Arm64" run_on: - macos-14-arm64 tags: [standard-non-linux] - name: test-win64 tasks: - name: .test-standard !.pypy - display_name: "* test win64" + display_name: "* Test Win64" run_on: - windows-64-vsMulti-small tags: [standard-non-linux] - name: test-win32 tasks: - name: .test-standard !.pypy - display_name: "* test win32" + display_name: "* Test Win32" run_on: - windows-64-vsMulti-small expansions: @@ -670,7 +670,7 @@ buildvariants: - name: storage-inmemory-rhel8 tasks: - name: .test-standard .standalone-noauth-nossl - display_name: Storage inmemory rhel8 + display_name: Storage Inmemory Rhel8 run_on: - rhel87-small expansions: @@ -678,7 +678,7 @@ buildvariants: - name: storage-mmapv1-rhel8 tasks: - name: .test-standard !.sharded_cluster-auth-ssl .server-4.0 - display_name: Storage mmapv1 rhel8 + display_name: Storage Mmapv1 Rhel8 run_on: - rhel87-small expansions: diff --git a/.evergreen/scripts/generate_config_utils.py b/.evergreen/scripts/generate_config_utils.py index 497e76e733..aa1ddd116c 100644 --- a/.evergreen/scripts/generate_config_utils.py +++ b/.evergreen/scripts/generate_config_utils.py @@ -207,7 +207,7 @@ def get_common_name(base: str, sep: str, **kwargs) -> str: else: continue display_name = f"{display_name}{sep}{name}" - return display_name.capitalize() + return display_name.title() def get_variant_name(base: str, host: str | Host | None = None, **kwargs) -> str: From 57bd69fecb032652b35a756e10b553a83a6e7237 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Fri, 2 May 2025 10:56:14 -0500 Subject: [PATCH 09/12] clean up names --- .evergreen/generated_configs/variants.yml | 120 ++++++++++---------- .evergreen/scripts/generate_config.py | 2 +- .evergreen/scripts/generate_config_utils.py | 2 +- 3 files changed, 62 insertions(+), 62 deletions(-) diff --git a/.evergreen/generated_configs/variants.yml b/.evergreen/generated_configs/variants.yml index a1aa9358d7..71d0c0a6bd 100644 --- a/.evergreen/generated_configs/variants.yml +++ b/.evergreen/generated_configs/variants.yml @@ -3,7 +3,7 @@ buildvariants: - name: openssl-1.0.2-rhel7-v5.0-python3.9 tasks: - name: .test-no-toolchain - display_name: Openssl 1.0.2 Rhel7 V5.0 Python3.9 + display_name: OpenSSL 1.0.2 RHEL7 v5.0 Python3.9 run_on: - rhel79-small batchtime: 10080 @@ -14,7 +14,7 @@ buildvariants: - name: other-hosts-rhel9-fips-latest tasks: - name: .test-no-toolchain - display_name: Other Hosts Rhel9-Fips Latest + display_name: Other hosts RHEL9-FIPS latest run_on: - rhel92-fips batchtime: 10080 @@ -25,7 +25,7 @@ buildvariants: - name: other-hosts-rhel8-zseries-latest tasks: - name: .test-no-toolchain - display_name: Other Hosts Rhel8-Zseries Latest + display_name: Other hosts RHEL8-zseries latest run_on: - rhel8-zseries-small batchtime: 10080 @@ -35,7 +35,7 @@ buildvariants: - name: other-hosts-rhel8-power8-latest tasks: - name: .test-no-toolchain - display_name: Other Hosts Rhel8-Power8 Latest + display_name: Other hosts RHEL8-POWER8 latest run_on: - rhel8-power-small batchtime: 10080 @@ -45,7 +45,7 @@ buildvariants: - name: other-hosts-rhel8-arm64-latest tasks: - name: .test-no-toolchain - display_name: Other Hosts Rhel8-Arm64 Latest + display_name: Other hosts RHEL8-arm64 latest run_on: - rhel82-arm64-small batchtime: 10080 @@ -55,7 +55,7 @@ buildvariants: - name: other-hosts-amazon2023-latest tasks: - name: .test-no-toolchain - display_name: Other Hosts Amazon2023 Latest + display_name: Other hosts Amazon2023 latest run_on: - amazon2023-arm64-latest-large-m8g batchtime: 10080 @@ -67,7 +67,7 @@ buildvariants: - name: atlas-connect-rhel8 tasks: - name: .test-no-orchestration - display_name: Atlas Connect Rhel8 + display_name: Atlas connect RHEL8 run_on: - rhel87-small @@ -85,19 +85,19 @@ buildvariants: - name: auth-aws-ubuntu-20 tasks: - name: .auth-aws - display_name: Auth Aws Ubuntu-20 + display_name: Auth AWS Ubuntu-20 run_on: - ubuntu2004-small - name: auth-aws-win64 tasks: - name: .auth-aws !.auth-aws-ecs - display_name: Auth Aws Win64 + display_name: Auth AWS Win64 run_on: - windows-64-vsMulti-small - name: auth-aws-macos tasks: - name: .auth-aws !.auth-aws-web-identity !.auth-aws-ecs !.auth-aws-ec2 - display_name: Auth Aws Macos + display_name: Auth AWS macOS run_on: - macos-14 @@ -121,7 +121,7 @@ buildvariants: - name: compression-snappy-rhel8 tasks: - name: .test-standard - display_name: Compression Snappy Rhel8 + display_name: Compression snappy RHEL8 run_on: - rhel87-small expansions: @@ -129,7 +129,7 @@ buildvariants: - name: compression-zlib-rhel8 tasks: - name: .test-standard - display_name: Compression Zlib Rhel8 + display_name: Compression zlib RHEL8 run_on: - rhel87-small expansions: @@ -137,7 +137,7 @@ buildvariants: - name: compression-zstd-rhel8 tasks: - name: .test-standard !.server-4.0 - display_name: Compression Zstd Rhel8 + display_name: Compression zstd RHEL8 run_on: - rhel87-small expansions: @@ -155,7 +155,7 @@ buildvariants: - name: disable-test-commands-rhel8-python3.9 tasks: - name: .test-standard .server-latest - display_name: Disable Test Commands Rhel8 Python3.9 + display_name: Disable test commands RHEL8 Python3.9 run_on: - rhel87-small expansions: @@ -168,7 +168,7 @@ buildvariants: - name: doctests-rhel8 tasks: - name: .test-non-standard .standalone-noauth-nossl - display_name: Doctests Rhel8 + display_name: Doctests RHEL8 run_on: - rhel87-small expansions: @@ -178,7 +178,7 @@ buildvariants: - name: encryption-rhel8 tasks: - name: .test-non-standard - display_name: Encryption Rhel8 + display_name: Encryption RHEL8 run_on: - rhel87-small batchtime: 10080 @@ -188,7 +188,7 @@ buildvariants: - name: encryption-macos tasks: - name: .test-non-standard !.pypy - display_name: Encryption Macos + display_name: Encryption macOS run_on: - macos-14 batchtime: 10080 @@ -208,7 +208,7 @@ buildvariants: - name: encryption-crypt_shared-rhel8 tasks: - name: .test-non-standard - display_name: Encryption Crypt_Shared Rhel8 + display_name: Encryption crypt_shared RHEL8 run_on: - rhel87-small batchtime: 10080 @@ -219,7 +219,7 @@ buildvariants: - name: encryption-crypt_shared-macos tasks: - name: .test-non-standard !.pypy - display_name: Encryption Crypt_Shared Macos + display_name: Encryption crypt_shared macOS run_on: - macos-14 batchtime: 10080 @@ -230,7 +230,7 @@ buildvariants: - name: encryption-crypt_shared-win64 tasks: - name: .test-non-standard !.pypy - display_name: Encryption Crypt_Shared Win64 + display_name: Encryption crypt_shared Win64 run_on: - windows-64-vsMulti-small batchtime: 10080 @@ -241,7 +241,7 @@ buildvariants: - name: encryption-pyopenssl-rhel8 tasks: - name: .test-non-standard - display_name: Encryption Pyopenssl Rhel8 + display_name: Encryption PyOpenSSL RHEL8 run_on: - rhel87-small batchtime: 10080 @@ -254,7 +254,7 @@ buildvariants: - name: auth-enterprise-rhel8 tasks: - name: .test-non-standard .auth - display_name: Auth Enterprise Rhel8 + display_name: Auth Enterprise RHEL8 run_on: - rhel87-small expansions: @@ -263,7 +263,7 @@ buildvariants: - name: auth-enterprise-macos tasks: - name: .test-non-standard !.pypy .auth - display_name: Auth Enterprise Macos + display_name: Auth Enterprise macOS run_on: - macos-14 expansions: @@ -283,7 +283,7 @@ buildvariants: - name: free-threaded-rhel8-python3.13t tasks: - name: .free-threading - display_name: Free-Threaded Rhel8 Python3.13T + display_name: Free-threaded RHEL8 Python3.13t run_on: - rhel87-small expansions: @@ -291,7 +291,7 @@ buildvariants: - name: free-threaded-macos-python3.13t tasks: - name: .free-threading - display_name: Free-Threaded Macos Python3.13T + display_name: Free-threaded macOS Python3.13t run_on: - macos-14 expansions: @@ -299,7 +299,7 @@ buildvariants: - name: free-threaded-macos-arm64-python3.13t tasks: - name: .free-threading - display_name: Free-Threaded Macos Arm64 Python3.13T + display_name: Free-threaded macOS Arm64 Python3.13t run_on: - macos-14-arm64 expansions: @@ -309,7 +309,7 @@ buildvariants: - name: green-eventlet-rhel8 tasks: - name: .test-standard .standalone-noauth-nossl .python-3.9 - display_name: Green Eventlet Rhel8 + display_name: Green Eventlet RHEL8 run_on: - rhel87-small expansions: @@ -319,7 +319,7 @@ buildvariants: - name: green-gevent-rhel8 tasks: - name: .test-standard .standalone-noauth-nossl - display_name: Green Gevent Rhel8 + display_name: Green Gevent RHEL8 run_on: - rhel87-small expansions: @@ -367,7 +367,7 @@ buildvariants: - name: mockupdb-rhel8 tasks: - name: .test-no-orchestration - display_name: Mockupdb Rhel8 + display_name: MockupDB RHEL8 run_on: - rhel87-small expansions: @@ -378,7 +378,7 @@ buildvariants: tasks: - name: .test-non-standard .replica_set-noauth-ssl - name: .test-non-standard .standalone-noauth-nossl - display_name: Mod_Wsgi Standalone Ubuntu-22 + display_name: Mod_WSGI Standalone Ubuntu-22 run_on: - ubuntu2204-small expansions: @@ -389,7 +389,7 @@ buildvariants: tasks: - name: .test-non-standard .replica_set-noauth-ssl - name: .test-non-standard .standalone-noauth-nossl - display_name: Mod_Wsgi Embedded-Mode Ubuntu-22 + display_name: Mod_WSGI Embedded-Mode Ubuntu-22 run_on: - ubuntu2204-small expansions: @@ -401,7 +401,7 @@ buildvariants: - name: no-c-ext-rhel8 tasks: - name: .test-standard - display_name: No C Ext Rhel8 + display_name: No C Ext RHEL8 run_on: - rhel87-small @@ -409,7 +409,7 @@ buildvariants: - name: no-server-rhel8 tasks: - name: .test-no-orchestration - display_name: No Server Rhel8 + display_name: No server RHEL8 run_on: - rhel87-small @@ -417,7 +417,7 @@ buildvariants: - name: ocsp-rhel8 tasks: - name: .ocsp - display_name: Ocsp Rhel8 + display_name: OCSP RHEL8 run_on: - rhel87-small batchtime: 10080 @@ -425,7 +425,7 @@ buildvariants: tasks: - name: .ocsp-rsa !.ocsp-staple .latest - name: .ocsp-rsa !.ocsp-staple .4.4 - display_name: Ocsp Win64 + display_name: OCSP Win64 run_on: - windows-64-vsMulti-small batchtime: 10080 @@ -433,7 +433,7 @@ buildvariants: tasks: - name: .ocsp-rsa !.ocsp-staple .latest - name: .ocsp-rsa !.ocsp-staple .4.4 - display_name: Ocsp Macos + display_name: OCSP macOS run_on: - macos-14 batchtime: 10080 @@ -442,21 +442,21 @@ buildvariants: - name: auth-oidc-ubuntu-22 tasks: - name: .auth_oidc - display_name: Auth Oidc Ubuntu-22 + display_name: Auth OIDC Ubuntu-22 run_on: - ubuntu2204-small batchtime: 10080 - name: auth-oidc-macos tasks: - name: .auth_oidc !.auth_oidc_remote - display_name: Auth Oidc Macos + display_name: Auth OIDC macOS run_on: - macos-14 batchtime: 10080 - name: auth-oidc-win64 tasks: - name: .auth_oidc !.auth_oidc_remote - display_name: Auth Oidc Win64 + display_name: Auth OIDC Win64 run_on: - windows-64-vsMulti-small batchtime: 10080 @@ -475,7 +475,7 @@ buildvariants: tasks: - name: .test-standard .sync - name: .test-standard .async .replica_set-noauth-ssl - display_name: Pyopenssl Rhel8 + display_name: PyOpenSSL RHEL8 run_on: - rhel87-small batchtime: 10080 @@ -485,7 +485,7 @@ buildvariants: tasks: - name: .test-standard !.pypy .sync - name: .test-standard !.pypy .async .replica_set-noauth-ssl - display_name: Pyopenssl Macos + display_name: PyOpenSSL macOS run_on: - rhel87-small batchtime: 10080 @@ -495,7 +495,7 @@ buildvariants: tasks: - name: .test-standard !.pypy .sync - name: .test-standard !.pypy .async .replica_set-noauth-ssl - display_name: Pyopenssl Win64 + display_name: PyOpenSSL Win64 run_on: - rhel87-small batchtime: 10080 @@ -506,7 +506,7 @@ buildvariants: - name: search-index-helpers-rhel8-python3.9 tasks: - name: .search_index - display_name: Search Index Helpers Rhel8 Python3.9 + display_name: Search Index Helpers RHEL8 Python3.9 run_on: - rhel87-small expansions: @@ -516,63 +516,63 @@ buildvariants: - name: mongodb-v4.0 tasks: - name: .server-version - display_name: "* Mongodb V4.0" + display_name: "* MongoDB v4.0" run_on: - rhel87-small tags: [coverage_tag] - name: mongodb-v4.2 tasks: - name: .server-version - display_name: "* Mongodb V4.2" + display_name: "* MongoDB v4.2" run_on: - rhel87-small tags: [coverage_tag] - name: mongodb-v4.4 tasks: - name: .server-version - display_name: "* Mongodb V4.4" + display_name: "* MongoDB v4.4" run_on: - rhel87-small tags: [coverage_tag] - name: mongodb-v5.0 tasks: - name: .server-version - display_name: "* Mongodb V5.0" + display_name: "* MongoDB v5.0" run_on: - rhel87-small tags: [coverage_tag] - name: mongodb-v6.0 tasks: - name: .server-version - display_name: "* Mongodb V6.0" + display_name: "* MongoDB v6.0" run_on: - rhel87-small tags: [coverage_tag] - name: mongodb-v7.0 tasks: - name: .server-version - display_name: "* Mongodb V7.0" + display_name: "* MongoDB v7.0" run_on: - rhel87-small tags: [coverage_tag] - name: mongodb-v8.0 tasks: - name: .server-version - display_name: "* Mongodb V8.0" + display_name: "* MongoDB v8.0" run_on: - rhel87-small tags: [coverage_tag] - name: mongodb-rapid tasks: - name: .server-version - display_name: "* Mongodb Rapid" + display_name: "* MongoDB rapid" run_on: - rhel87-small tags: [coverage_tag] - name: mongodb-latest tasks: - name: .server-version - display_name: "* Mongodb Latest" + display_name: "* MongoDB latest" run_on: - rhel87-small tags: [coverage_tag] @@ -581,7 +581,7 @@ buildvariants: - name: serverless-rhel8-python3.9 tasks: - name: .serverless - display_name: Serverless Rhel8 Python3.9 + display_name: Serverless RHEL8 Python3.9 run_on: - rhel87-small batchtime: 10080 @@ -590,7 +590,7 @@ buildvariants: - name: serverless-rhel8-python3.13 tasks: - name: .serverless - display_name: Serverless Rhel8 Python3.13 + display_name: Serverless RHEL8 Python3.13 run_on: - rhel87-small batchtime: 10080 @@ -606,7 +606,7 @@ buildvariants: - name: .test-standard !.replica_set-noauth-ssl .server-8.0 - name: .test-standard !.replica_set-noauth-ssl .server-rapid - name: .test-standard !.replica_set-noauth-ssl .server-latest - display_name: Stable Api Require V1 Rhel8 Auth + display_name: Stable API require v1 RHEL8 Auth run_on: - rhel87-small expansions: @@ -622,7 +622,7 @@ buildvariants: - name: .test-standard .server-8.0 .standalone-noauth-nossl - name: .test-standard .server-rapid .standalone-noauth-nossl - name: .test-standard .server-latest .standalone-noauth-nossl - display_name: Stable Api Accept V2 Rhel8 Auth + display_name: Stable API accept v2 RHEL8 Auth run_on: - rhel87-small expansions: @@ -634,7 +634,7 @@ buildvariants: - name: test-macos tasks: - name: .test-standard !.pypy - display_name: "* Test Macos" + display_name: "* Test macOS" run_on: - macos-14 tags: [standard-non-linux] @@ -645,7 +645,7 @@ buildvariants: - name: .test-standard !.pypy .server-8.0 - name: .test-standard !.pypy .server-rapid - name: .test-standard !.pypy .server-latest - display_name: "* Test Macos Arm64" + display_name: "* Test macOS Arm64" run_on: - macos-14-arm64 tags: [standard-non-linux] @@ -670,7 +670,7 @@ buildvariants: - name: storage-inmemory-rhel8 tasks: - name: .test-standard .standalone-noauth-nossl - display_name: Storage Inmemory Rhel8 + display_name: Storage InMemory RHEL8 run_on: - rhel87-small expansions: @@ -678,7 +678,7 @@ buildvariants: - name: storage-mmapv1-rhel8 tasks: - name: .test-standard !.sharded_cluster-auth-ssl .server-4.0 - display_name: Storage Mmapv1 Rhel8 + display_name: Storage MMAPv1 RHEL8 run_on: - rhel87-small expansions: diff --git a/.evergreen/scripts/generate_config.py b/.evergreen/scripts/generate_config.py index b3b005a56b..6166f739a7 100644 --- a/.evergreen/scripts/generate_config.py +++ b/.evergreen/scripts/generate_config.py @@ -340,7 +340,7 @@ def create_mod_wsgi_variants(): expansions = dict( MOD_WSGI_VERSION="4", TEST_NAME="mod_wsgi", SUB_TEST_NAME=test_type.split("-")[0] ) - display_name = get_variant_name(f"mod_wsgi {test_type}", host) + display_name = get_variant_name(f"Mod_WSGI {test_type.title()}", host) variants.append( create_variant( [ diff --git a/.evergreen/scripts/generate_config_utils.py b/.evergreen/scripts/generate_config_utils.py index aa1ddd116c..ad092983fa 100644 --- a/.evergreen/scripts/generate_config_utils.py +++ b/.evergreen/scripts/generate_config_utils.py @@ -207,7 +207,7 @@ def get_common_name(base: str, sep: str, **kwargs) -> str: else: continue display_name = f"{display_name}{sep}{name}" - return display_name.title() + return display_name def get_variant_name(base: str, host: str | Host | None = None, **kwargs) -> str: From 7a840fb85102d72f68843b4f71adacc8aec4460d Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Fri, 2 May 2025 10:57:51 -0500 Subject: [PATCH 10/12] clean up mod_wsgi --- .evergreen/generated_configs/variants.yml | 8 ++++---- .evergreen/scripts/generate_config.py | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.evergreen/generated_configs/variants.yml b/.evergreen/generated_configs/variants.yml index 71d0c0a6bd..5f637d3f80 100644 --- a/.evergreen/generated_configs/variants.yml +++ b/.evergreen/generated_configs/variants.yml @@ -376,8 +376,8 @@ buildvariants: # Mod wsgi tests - name: mod_wsgi-standalone-ubuntu-22 tasks: - - name: .test-non-standard .replica_set-noauth-ssl - - name: .test-non-standard .standalone-noauth-nossl + - name: .test-non-standard .replica_set-noauth-ssl .server-latest + - name: .test-non-standard .standalone-noauth-nossl .server-latest display_name: Mod_WSGI Standalone Ubuntu-22 run_on: - ubuntu2204-small @@ -387,8 +387,8 @@ buildvariants: SUB_TEST_NAME: standalone - name: mod_wsgi-embedded-mode-ubuntu-22 tasks: - - name: .test-non-standard .replica_set-noauth-ssl - - name: .test-non-standard .standalone-noauth-nossl + - name: .test-non-standard .replica_set-noauth-ssl .server-latest + - name: .test-non-standard .standalone-noauth-nossl .server-latest display_name: Mod_WSGI Embedded-Mode Ubuntu-22 run_on: - ubuntu2204-small diff --git a/.evergreen/scripts/generate_config.py b/.evergreen/scripts/generate_config.py index 6166f739a7..e0decd1682 100644 --- a/.evergreen/scripts/generate_config.py +++ b/.evergreen/scripts/generate_config.py @@ -344,8 +344,8 @@ def create_mod_wsgi_variants(): variants.append( create_variant( [ - ".test-non-standard .replica_set-noauth-ssl", - ".test-non-standard .standalone-noauth-nossl", + ".test-non-standard .replica_set-noauth-ssl .server-latest", + ".test-non-standard .standalone-noauth-nossl .server-latest", ], display_name, host=host, From 7e880ac4622dd2243fcf2aa62411a05aed90104e Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Fri, 2 May 2025 10:59:25 -0500 Subject: [PATCH 11/12] clean up mod_wsgi --- .evergreen/generated_configs/variants.yml | 4 ++-- .evergreen/scripts/generate_config.py | 8 +++----- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/.evergreen/generated_configs/variants.yml b/.evergreen/generated_configs/variants.yml index 5f637d3f80..bd0222c14f 100644 --- a/.evergreen/generated_configs/variants.yml +++ b/.evergreen/generated_configs/variants.yml @@ -385,11 +385,11 @@ buildvariants: MOD_WSGI_VERSION: "4" TEST_NAME: mod_wsgi SUB_TEST_NAME: standalone - - name: mod_wsgi-embedded-mode-ubuntu-22 + - name: mod_wsgi-embedded-ubuntu-22 tasks: - name: .test-non-standard .replica_set-noauth-ssl .server-latest - name: .test-non-standard .standalone-noauth-nossl .server-latest - display_name: Mod_WSGI Embedded-Mode Ubuntu-22 + display_name: Mod_WSGI Embedded Ubuntu-22 run_on: - ubuntu2204-small expansions: diff --git a/.evergreen/scripts/generate_config.py b/.evergreen/scripts/generate_config.py index e0decd1682..f6432d9611 100644 --- a/.evergreen/scripts/generate_config.py +++ b/.evergreen/scripts/generate_config.py @@ -336,11 +336,9 @@ def create_atlas_data_lake_variants(): def create_mod_wsgi_variants(): host = HOSTS["ubuntu22"] variants = [] - for test_type in ["standalone", "embedded-mode"]: - expansions = dict( - MOD_WSGI_VERSION="4", TEST_NAME="mod_wsgi", SUB_TEST_NAME=test_type.split("-")[0] - ) - display_name = get_variant_name(f"Mod_WSGI {test_type.title()}", host) + for test_type in ["standalone", "embedded"]: + expansions = dict(MOD_WSGI_VERSION="4", TEST_NAME="mod_wsgi", SUB_TEST_NAME=test_type) + display_name = get_variant_name(f"Mod_WSGI {test_type.capitalize()}", host) variants.append( create_variant( [ From 8ebceca7aed6b83e26fa725dc68fe5c4d91da9c0 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Fri, 2 May 2025 11:03:37 -0500 Subject: [PATCH 12/12] revert mod_wsgi --- .evergreen/generated_configs/tasks.yml | 62 +++++++++++++++++++++++ .evergreen/generated_configs/variants.yml | 20 ++------ .evergreen/scripts/generate_config.py | 41 +++++++++------ 3 files changed, 90 insertions(+), 33 deletions(-) diff --git a/.evergreen/generated_configs/tasks.yml b/.evergreen/generated_configs/tasks.yml index 22ceb0a3a6..5083b456c5 100644 --- a/.evergreen/generated_configs/tasks.yml +++ b/.evergreen/generated_configs/tasks.yml @@ -199,6 +199,68 @@ tasks: TEST_NAME: kms SUB_TEST_NAME: azure-fail + # Mod wsgi tests + - name: mod-wsgi-replica-set-python3.9 + commands: + - func: run server + vars: + TOPOLOGY: replica_set + PYTHON_VERSION: "3.9" + - func: run tests + vars: + TEST_NAME: mod_wsgi + SUB_TEST_NAME: standalone + PYTHON_VERSION: "3.9" + tags: [mod_wsgi] + - name: mod-wsgi-embedded-mode-replica-set-python3.10 + commands: + - func: run server + vars: + TOPOLOGY: replica_set + PYTHON_VERSION: "3.10" + - func: run tests + vars: + TEST_NAME: mod_wsgi + SUB_TEST_NAME: embedded + PYTHON_VERSION: "3.10" + tags: [mod_wsgi] + - name: mod-wsgi-replica-set-python3.11 + commands: + - func: run server + vars: + TOPOLOGY: replica_set + PYTHON_VERSION: "3.11" + - func: run tests + vars: + TEST_NAME: mod_wsgi + SUB_TEST_NAME: standalone + PYTHON_VERSION: "3.11" + tags: [mod_wsgi] + - name: mod-wsgi-embedded-mode-replica-set-python3.12 + commands: + - func: run server + vars: + TOPOLOGY: replica_set + PYTHON_VERSION: "3.12" + - func: run tests + vars: + TEST_NAME: mod_wsgi + SUB_TEST_NAME: embedded + PYTHON_VERSION: "3.12" + tags: [mod_wsgi] + - name: mod-wsgi-replica-set-python3.13 + commands: + - func: run server + vars: + TOPOLOGY: replica_set + PYTHON_VERSION: "3.13" + - func: run tests + vars: + TEST_NAME: mod_wsgi + SUB_TEST_NAME: standalone + PYTHON_VERSION: "3.13" + tags: [mod_wsgi] + # No orchestration tests - name: test-no-orchestration-python3.9 commands: diff --git a/.evergreen/generated_configs/variants.yml b/.evergreen/generated_configs/variants.yml index bd0222c14f..4ec9f5a3a8 100644 --- a/.evergreen/generated_configs/variants.yml +++ b/.evergreen/generated_configs/variants.yml @@ -374,28 +374,14 @@ buildvariants: TEST_NAME: mockupdb # Mod wsgi tests - - name: mod_wsgi-standalone-ubuntu-22 + - name: mod_wsgi-ubuntu-22 tasks: - - name: .test-non-standard .replica_set-noauth-ssl .server-latest - - name: .test-non-standard .standalone-noauth-nossl .server-latest - display_name: Mod_WSGI Standalone Ubuntu-22 + - name: .mod_wsgi + display_name: Mod_WSGI Ubuntu-22 run_on: - ubuntu2204-small expansions: MOD_WSGI_VERSION: "4" - TEST_NAME: mod_wsgi - SUB_TEST_NAME: standalone - - name: mod_wsgi-embedded-ubuntu-22 - tasks: - - name: .test-non-standard .replica_set-noauth-ssl .server-latest - - name: .test-non-standard .standalone-noauth-nossl .server-latest - display_name: Mod_WSGI Embedded Ubuntu-22 - run_on: - - ubuntu2204-small - expansions: - MOD_WSGI_VERSION: "4" - TEST_NAME: mod_wsgi - SUB_TEST_NAME: embedded # No c ext tests - name: no-c-ext-rhel8 diff --git a/.evergreen/scripts/generate_config.py b/.evergreen/scripts/generate_config.py index f6432d9611..e13976d8c7 100644 --- a/.evergreen/scripts/generate_config.py +++ b/.evergreen/scripts/generate_config.py @@ -335,22 +335,10 @@ def create_atlas_data_lake_variants(): def create_mod_wsgi_variants(): host = HOSTS["ubuntu22"] - variants = [] - for test_type in ["standalone", "embedded"]: - expansions = dict(MOD_WSGI_VERSION="4", TEST_NAME="mod_wsgi", SUB_TEST_NAME=test_type) - display_name = get_variant_name(f"Mod_WSGI {test_type.capitalize()}", host) - variants.append( - create_variant( - [ - ".test-non-standard .replica_set-noauth-ssl .server-latest", - ".test-non-standard .standalone-noauth-nossl .server-latest", - ], - display_name, - host=host, - expansions=expansions, - ) - ) - return variants + tasks = [".mod_wsgi"] + expansions = dict(MOD_WSGI_VERSION="4") + display_name = get_variant_name("Mod_WSGI", host) + return [create_variant(tasks, display_name, host=host, expansions=expansions)] def create_disable_test_commands_variants(): @@ -755,6 +743,27 @@ def create_oidc_tasks(): return tasks +def create_mod_wsgi_tasks(): + tasks = [] + for (test, topology), python in zip_cycle( + product(["standalone", "embedded-mode"], ["standalone", "replica_set"]), CPYTHONS + ): + if test == "standalone": + task_name = "mod-wsgi-" + else: + task_name = "mod-wsgi-embedded-mode-" + task_name += topology.replace("_", "-") + task_name = get_task_name(task_name, python=python) + server_vars = dict(TOPOLOGY=topology, PYTHON_VERSION=python) + server_func = FunctionCall(func="run server", vars=server_vars) + vars = dict(TEST_NAME="mod_wsgi", SUB_TEST_NAME=test.split("-")[0], PYTHON_VERSION=python) + test_func = FunctionCall(func="run tests", vars=vars) + tags = ["mod_wsgi"] + commands = [server_func, test_func] + tasks.append(EvgTask(name=task_name, tags=tags, commands=commands)) + return tasks + + def _create_ocsp_tasks(algo, variant, server_type, base_task_name): tasks = [] file_name = f"{algo}-basic-tls-ocsp-{variant}.json"