PYTHON-5372 Convert Remaining Variants to Use Common Tasks

Author: blink1073

.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:

.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

.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"]):