address review

Author: blink1073

.evergreen/generated_configs/tasks.yml

@@ -8126,39 +8126,39 @@ tasks:
           TOPOLOGY: sharded_cluster
           PYTHON_VERSION: pypy3.10
     tags: [server-version]
-  - name: test-python3.9-noauth-nossl-standalone-cov
+  - name: test-python3.9-auth-ssl-standalone-cov
     commands:
       - func: run server
         vars:
-          AUTH: noauth
-          SSL: nossl
+          AUTH: auth
+          SSL: ssl
           TOPOLOGY: standalone
           COVERAGE: "1"
       - func: run tests
         vars:
-          AUTH: noauth
-          SSL: nossl
+          AUTH: auth
+          SSL: ssl
           TOPOLOGY: standalone
           COVERAGE: "1"
           PYTHON_VERSION: "3.9"
     tags: [server-version]
-  - name: test-python3.10-noauth-ssl-replica-set-cov
+  - name: test-python3.10-noauth-nossl-replica-set-cov
     commands:
       - func: run server
         vars:
           AUTH: noauth
-          SSL: ssl
+          SSL: nossl
           TOPOLOGY: replica_set
           COVERAGE: "1"
       - func: run tests
         vars:
           AUTH: noauth
-          SSL: ssl
+          SSL: nossl
           TOPOLOGY: replica_set
           COVERAGE: "1"
           PYTHON_VERSION: "3.10"
     tags: [server-version]
-  - name: test-python3.11-noauth-nossl-standalone-cov
+  - name: test-python3.12-noauth-nossl-standalone-cov
     commands:
       - func: run server
         vars:
@@ -8172,52 +8172,36 @@ tasks:
           SSL: nossl
           TOPOLOGY: standalone
           COVERAGE: "1"
-          PYTHON_VERSION: "3.11"
+          PYTHON_VERSION: "3.12"
     tags: [server-version]
-  - name: test-python3.12-noauth-ssl-replica-set-cov
+  - name: test-python3.13-auth-ssl-replica-set-cov
     commands:
       - func: run server
         vars:
-          AUTH: noauth
+          AUTH: auth
           SSL: ssl
           TOPOLOGY: replica_set
           COVERAGE: "1"
       - func: run tests
         vars:
-          AUTH: noauth
+          AUTH: auth
           SSL: ssl
           TOPOLOGY: replica_set
           COVERAGE: "1"
-          PYTHON_VERSION: "3.12"
+          PYTHON_VERSION: "3.13"
     tags: [server-version]
-  - name: test-python3.13-noauth-nossl-standalone-cov
+  - name: test-pypy3.10-noauth-nossl-sharded-cluster
     commands:
       - func: run server
         vars:
           AUTH: noauth
           SSL: nossl
-          TOPOLOGY: standalone
-          COVERAGE: "1"
+          TOPOLOGY: sharded_cluster
       - func: run tests
         vars:
           AUTH: noauth
           SSL: nossl
-          TOPOLOGY: standalone
-          COVERAGE: "1"
-          PYTHON_VERSION: "3.13"
-    tags: [server-version]
-  - name: test-pypy3.10-noauth-ssl-replica-set
-    commands:
-      - func: run server
-        vars:
-          AUTH: noauth
-          SSL: ssl
-          TOPOLOGY: replica_set
-      - func: run tests
-        vars:
-          AUTH: noauth
-          SSL: ssl
-          TOPOLOGY: replica_set
+          TOPOLOGY: sharded_cluster
           PYTHON_VERSION: pypy3.10
     tags: [server-version]
 

.evergreen/scripts/generate_config.py

@@ -580,20 +580,18 @@ def create_aws_lambda_variants():
 
 def create_server_version_tasks():
     tasks = []
-    task_types = [(p, "sharded_cluster") for p in ALL_PYTHONS]
-    for python, topology in zip_cycle(ALL_PYTHONS, ["standalone", "replica_set"]):
-        task_types.append((python, topology))
-    for python, topology in task_types:
+    # 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, TOPOLOGIES, ["auth", "noauth"], ["ssl", "nossl"]
+    ):
+        # Skip the ones we already have.
+        if topology == "sharded_cluster" and auth == "auth" and ssl == "ssl":
+            continue
+        task_types.append((python, topology, auth, ssl))
+    for python, topology, auth, ssl in task_types:
         tags = ["server-version"]
-        if topology == "standalone":
-            auth = "noauth"
-            ssl = "nossl"
-        elif topology == "replica_set":
-            auth = "noauth"
-            ssl = "ssl"
-        else:
-            auth = "auth"
-            ssl = "ssl"
         expansions = dict(AUTH=auth, SSL=ssl, TOPOLOGY=topology)
         if python not in PYPYS:
             expansions["COVERAGE"] = "1"