revert mod_wsgi

Author: blink1073

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

.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

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