update

Author: blink1073

.evergreen/generated_configs/tasks.yml

@@ -8126,7 +8126,23 @@ tasks:
           TOPOLOGY: sharded_cluster
           PYTHON_VERSION: pypy3.10
     tags: [server-version]
-  - name: test-python3.9-auth-nossl-standalone-cov
+  - name: test-python3.9-auth-ssl-standalone-cov
+    commands:
+      - func: run server
+        vars:
+          AUTH: auth
+          SSL: ssl
+          TOPOLOGY: standalone
+          COVERAGE: "1"
+      - func: run tests
+        vars:
+          AUTH: auth
+          SSL: ssl
+          TOPOLOGY: standalone
+          COVERAGE: "1"
+          PYTHON_VERSION: "3.9"
+    tags: [server-version]
+  - name: test-python3.10-auth-nossl-standalone-cov
     commands:
       - func: run server
         vars:
@@ -8140,9 +8156,25 @@ tasks:
           SSL: nossl
           TOPOLOGY: standalone
           COVERAGE: "1"
-          PYTHON_VERSION: "3.9"
+          PYTHON_VERSION: "3.10"
+    tags: [server-version]
+  - name: test-python3.11-noauth-ssl-standalone-cov
+    commands:
+      - func: run server
+        vars:
+          AUTH: noauth
+          SSL: ssl
+          TOPOLOGY: standalone
+          COVERAGE: "1"
+      - func: run tests
+        vars:
+          AUTH: noauth
+          SSL: ssl
+          TOPOLOGY: standalone
+          COVERAGE: "1"
+          PYTHON_VERSION: "3.11"
     tags: [server-version]
-  - name: test-python3.10-noauth-nossl-standalone-cov
+  - name: test-python3.12-noauth-nossl-standalone-cov
     commands:
       - func: run server
         vars:
@@ -8156,25 +8188,55 @@ tasks:
           SSL: nossl
           TOPOLOGY: standalone
           COVERAGE: "1"
-          PYTHON_VERSION: "3.10"
+          PYTHON_VERSION: "3.12"
     tags: [server-version]
-  - name: test-python3.11-auth-nossl-replica-set-cov
+  - name: test-python3.13-auth-ssl-replica-set-cov
     commands:
       - func: run server
         vars:
           AUTH: auth
-          SSL: nossl
+          SSL: ssl
           TOPOLOGY: replica_set
           COVERAGE: "1"
       - func: run tests
+        vars:
+          AUTH: auth
+          SSL: ssl
+          TOPOLOGY: replica_set
+          COVERAGE: "1"
+          PYTHON_VERSION: "3.13"
+    tags: [server-version]
+  - name: test-pypy3.10-auth-nossl-replica-set
+    commands:
+      - func: run server
         vars:
           AUTH: auth
           SSL: nossl
           TOPOLOGY: replica_set
+      - func: run tests
+        vars:
+          AUTH: auth
+          SSL: nossl
+          TOPOLOGY: replica_set
+          PYTHON_VERSION: pypy3.10
+    tags: [server-version]
+  - name: test-python3.9-noauth-ssl-replica-set-cov
+    commands:
+      - func: run server
+        vars:
+          AUTH: noauth
+          SSL: ssl
+          TOPOLOGY: replica_set
           COVERAGE: "1"
-          PYTHON_VERSION: "3.11"
+      - func: run tests
+        vars:
+          AUTH: noauth
+          SSL: ssl
+          TOPOLOGY: replica_set
+          COVERAGE: "1"
+          PYTHON_VERSION: "3.9"
     tags: [server-version]
-  - name: test-python3.12-noauth-nossl-replica-set-cov
+  - name: test-python3.10-noauth-nossl-replica-set-cov
     commands:
       - func: run server
         vars:
@@ -8188,9 +8250,9 @@ tasks:
           SSL: nossl
           TOPOLOGY: replica_set
           COVERAGE: "1"
-          PYTHON_VERSION: "3.12"
+          PYTHON_VERSION: "3.10"
     tags: [server-version]
-  - name: test-python3.13-auth-nossl-sharded-cluster-cov
+  - name: test-python3.12-auth-nossl-sharded-cluster-cov
     commands:
       - func: run server
         vars:
@@ -8204,6 +8266,22 @@ tasks:
           SSL: nossl
           TOPOLOGY: sharded_cluster
           COVERAGE: "1"
+          PYTHON_VERSION: "3.12"
+    tags: [server-version]
+  - name: test-python3.13-noauth-ssl-sharded-cluster-cov
+    commands:
+      - func: run server
+        vars:
+          AUTH: noauth
+          SSL: ssl
+          TOPOLOGY: sharded_cluster
+          COVERAGE: "1"
+      - func: run tests
+        vars:
+          AUTH: noauth
+          SSL: ssl
+          TOPOLOGY: sharded_cluster
+          COVERAGE: "1"
           PYTHON_VERSION: "3.13"
     tags: [server-version]
   - name: test-pypy3.10-noauth-nossl-sharded-cluster

.evergreen/scripts/generate_config.py

@@ -583,8 +583,8 @@ def create_server_version_tasks():
     # Test all pythons with sharded_cluster, auth, and ssl.
     task_types = [(p, "sharded_cluster", "auth", "ssl") for p in ALL_PYTHONS]
     # Test all combinations of topology, auth, and ssl, with rotating pythons.
-    for python, (topology, auth, ssl) in zip_cycle(
-        ALL_PYTHONS, product(TOPOLOGIES, ["auth", "noauth"], ["ssl", "nossl"])
+    for (topology, auth, ssl), python in zip_cycle(
+        list(product(TOPOLOGIES, ["auth", "noauth"], ["ssl", "nossl"])), ALL_PYTHONS
     ):
         # Skip the ones we already have.
         if topology == "sharded_cluster" and auth == "auth" and ssl == "ssl":