update green framework tests

Author: blink1073

.evergreen/generated_configs/tasks.yml

@@ -503,17 +503,29 @@ tasks:
     tags: [mockupdb]
 
   # Mod wsgi tests
-  - name: mod-wsgi-standalone
+  - name: mod-wsgi-replica-set-python3.9
     commands:
       - func: run server
         vars:
-          TOPOLOGY: standalone
+          TOPOLOGY: replica_set
       - 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
+      - func: run tests
+        vars:
+          TEST_NAME: mod_wsgi
+          SUB_TEST_NAME: embedded
+          PYTHON_VERSION: "3.10"
     tags: [mod_wsgi]
-  - name: mod-wsgi-replica-set
+  - name: mod-wsgi-replica-set-python3.11
     commands:
       - func: run server
         vars:
@@ -522,26 +534,29 @@ tasks:
         vars:
           TEST_NAME: mod_wsgi
           SUB_TEST_NAME: standalone
+          PYTHON_VERSION: "3.11"
     tags: [mod_wsgi]
-  - name: mod-wsgi-embedded-mode-standalone
+  - name: mod-wsgi-embedded-mode-replica-set-python3.12
     commands:
       - func: run server
         vars:
-          TOPOLOGY: standalone
+          TOPOLOGY: replica_set
       - func: run tests
         vars:
           TEST_NAME: mod_wsgi
           SUB_TEST_NAME: embedded
+          PYTHON_VERSION: "3.12"
     tags: [mod_wsgi]
-  - name: mod-wsgi-embedded-mode-replica-set
+  - name: mod-wsgi-replica-set-python3.13
     commands:
       - func: run server
         vars:
           TOPOLOGY: replica_set
       - func: run tests
         vars:
           TEST_NAME: mod_wsgi
-          SUB_TEST_NAME: embedded
+          SUB_TEST_NAME: standalone
+          PYTHON_VERSION: "3.13"
     tags: [mod_wsgi]
 
   # No server tests

.evergreen/generated_configs/variants.yml

@@ -484,39 +484,26 @@ buildvariants:
       PYTHON_BINARY: /Library/Frameworks/PythonT.Framework/Versions/3.13/bin/python3t
 
   # Green framework tests
-  - name: green-eventlet-rhel8-python3.9
+  - name: green-eventlet-rhel8
     tasks:
-      - name: .standalone .noauth .nossl .sync_async
-    display_name: Green Eventlet RHEL8 Python3.9
+      - name: .standard-linux .standalone-noauth-nossl .python-3.9
+    display_name: Green Eventlet RHEL8
     run_on:
       - rhel87-small
     expansions:
       GREEN_FRAMEWORK: eventlet
       AUTH: auth
       SSL: ssl
-      PYTHON_BINARY: /opt/python/3.9/bin/python3
-  - name: green-gevent-rhel8-python3.9
-    tasks:
-      - name: .standalone .noauth .nossl .sync_async
-    display_name: Green Gevent RHEL8 Python3.9
-    run_on:
-      - rhel87-small
-    expansions:
-      GREEN_FRAMEWORK: gevent
-      AUTH: auth
-      SSL: ssl
-      PYTHON_BINARY: /opt/python/3.9/bin/python3
-  - name: green-gevent-rhel8-python3.13
+  - name: green-gevent-rhel8
     tasks:
-      - name: .standalone .noauth .nossl .sync_async
-    display_name: Green Gevent RHEL8 Python3.13
+      - name: .standard-linux .standalone-noauth-nossl
+    display_name: Green Gevent RHEL8
     run_on:
       - rhel87-small
     expansions:
       GREEN_FRAMEWORK: gevent
       AUTH: auth
       SSL: ssl
-      PYTHON_BINARY: /opt/python/3.13/bin/python3
 
   # Import time tests
   - name: import-time
@@ -559,24 +546,14 @@ buildvariants:
       PYTHON_BINARY: /opt/python/3.9/bin/python3
 
   # Mod wsgi tests
-  - name: mod_wsgi-ubuntu-22-python3.9
+  - name: mod_wsgi-ubuntu-22
     tasks:
       - name: .mod_wsgi
-    display_name: mod_wsgi Ubuntu-22 Python3.9
+    display_name: mod_wsgi Ubuntu-22
     run_on:
       - ubuntu2204-small
     expansions:
       MOD_WSGI_VERSION: "4"
-      PYTHON_BINARY: /opt/python/3.9/bin/python3
-  - name: mod_wsgi-ubuntu-22-python3.13
-    tasks:
-      - name: .mod_wsgi
-    display_name: mod_wsgi Ubuntu-22 Python3.13
-    run_on:
-      - ubuntu2204-small
-    expansions:
-      MOD_WSGI_VERSION: "4"
-      PYTHON_BINARY: /opt/python/3.13/bin/python3
 
   # No c ext tests
   - name: no-c-ext-rhel8

.evergreen/scripts/generate_config.py

@@ -340,18 +340,16 @@ def create_stable_api_variants():
 
 def create_green_framework_variants():
     variants = []
-    tasks = [".standalone .noauth .nossl .sync_async"]
     host = DEFAULT_HOST
-    for python, framework in product([CPYTHONS[0], CPYTHONS[-1]], ["eventlet", "gevent"]):
-        if framework == "eventlet" and python == CPYTHONS[-1]:
+    for framework in ["eventlet", "gevent"]:
+        tasks = [".standard-linux .standalone-noauth-nossl"]
+        if framework == "eventlet":
             # Eventlet has issues with dnspython > 2.0 and newer versions of CPython
             # https://jira.mongodb.org/browse/PYTHON-5284
-            continue
+            tasks = [".standard-linux .standalone-noauth-nossl .python-3.9"]
         expansions = dict(GREEN_FRAMEWORK=framework, AUTH="auth", SSL="ssl")
-        display_name = get_variant_name(f"Green {framework.capitalize()}", host, python=python)
-        variant = create_variant(
-            tasks, display_name, host=host, python=python, expansions=expansions
-        )
+        display_name = get_variant_name(f"Green {framework.capitalize()}", host)
+        variant = create_variant(tasks, display_name, host=host, expansions=expansions)
         variants.append(variant)
     return variants
 
@@ -377,17 +375,11 @@ def create_atlas_data_lake_variants():
 
 
 def create_mod_wsgi_variants():
-    variants = []
     host = HOSTS["ubuntu22"]
     tasks = [".mod_wsgi"]
     expansions = dict(MOD_WSGI_VERSION="4")
-    for python in MIN_MAX_PYTHON:
-        display_name = get_variant_name("mod_wsgi", host, python=python)
-        variant = create_variant(
-            tasks, display_name, host=host, python=python, expansions=expansions
-        )
-        variants.append(variant)
-    return variants
+    display_name = get_variant_name("mod_wsgi", host)
+    return [create_variant(tasks, display_name, host=host, expansions=expansions)]
 
 
 def create_disable_test_commands_variants():
@@ -798,15 +790,18 @@ def create_oidc_tasks():
 
 def create_mod_wsgi_tasks():
     tasks = []
-    for test, topology in product(["standalone", "embedded-mode"], ["standalone", "replica_set"]):
+    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)
         server_func = FunctionCall(func="run server", vars=server_vars)
-        vars = dict(TEST_NAME="mod_wsgi", SUB_TEST_NAME=test.split("-")[0])
+        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]