pare down matrix

Author: blink1073

.evergreen/generated_configs/tasks.yml

@@ -8044,30 +8044,6 @@ tasks:
           AUTH: noauth
           SSL: nossl
     tags: [server-version]
-  - name: test-python3.9-replica-set-noauth-ssl
-    commands:
-      - func: run server
-        vars:
-          TOPOLOGY: replica_set
-          AUTH: noauth
-          SSL: ssl
-      - func: run tests
-        vars:
-          AUTH: noauth
-          SSL: ssl
-    tags: [server-version]
-  - name: test-python3.9-sharded-cluster-auth-ssl
-    commands:
-      - func: run server
-        vars:
-          TOPOLOGY: sharded_cluster
-          AUTH: auth
-          SSL: ssl
-      - func: run tests
-        vars:
-          AUTH: auth
-          SSL: ssl
-    tags: [server-version]
   - name: test-python3.10-standalone-noauth-nossl
     commands:
       - func: run server
@@ -8080,31 +8056,19 @@ tasks:
           AUTH: noauth
           SSL: nossl
     tags: [server-version]
-  - name: test-python3.10-replica-set-noauth-ssl
+  - name: test-python3.11-standalone-noauth-nossl
     commands:
       - func: run server
         vars:
-          TOPOLOGY: replica_set
+          TOPOLOGY: standalone
           AUTH: noauth
-          SSL: ssl
+          SSL: nossl
       - func: run tests
         vars:
           AUTH: noauth
-          SSL: ssl
-    tags: [server-version]
-  - name: test-python3.10-sharded-cluster-auth-ssl
-    commands:
-      - func: run server
-        vars:
-          TOPOLOGY: sharded_cluster
-          AUTH: auth
-          SSL: ssl
-      - func: run tests
-        vars:
-          AUTH: auth
-          SSL: ssl
+          SSL: nossl
     tags: [server-version]
-  - name: test-python3.11-standalone-noauth-nossl
+  - name: test-python3.12-standalone-noauth-nossl
     commands:
       - func: run server
         vars:
@@ -8116,31 +8080,19 @@ tasks:
           AUTH: noauth
           SSL: nossl
     tags: [server-version]
-  - name: test-python3.11-replica-set-noauth-ssl
+  - name: test-python3.13-standalone-noauth-nossl
     commands:
       - func: run server
         vars:
-          TOPOLOGY: replica_set
+          TOPOLOGY: standalone
           AUTH: noauth
-          SSL: ssl
+          SSL: nossl
       - func: run tests
         vars:
           AUTH: noauth
-          SSL: ssl
-    tags: [server-version]
-  - name: test-python3.11-sharded-cluster-auth-ssl
-    commands:
-      - func: run server
-        vars:
-          TOPOLOGY: sharded_cluster
-          AUTH: auth
-          SSL: ssl
-      - func: run tests
-        vars:
-          AUTH: auth
-          SSL: ssl
+          SSL: nossl
     tags: [server-version]
-  - name: test-python3.12-standalone-noauth-nossl
+  - name: test-pypy3.10-standalone-noauth-nossl
     commands:
       - func: run server
         vars:
@@ -8152,7 +8104,7 @@ tasks:
           AUTH: noauth
           SSL: nossl
     tags: [server-version]
-  - name: test-python3.12-replica-set-noauth-ssl
+  - name: test-python3.9-replica-set-noauth-ssl
     commands:
       - func: run server
         vars:
@@ -8164,7 +8116,7 @@ tasks:
           AUTH: noauth
           SSL: ssl
     tags: [server-version]
-  - name: test-python3.12-sharded-cluster-auth-ssl
+  - name: test-python3.10-sharded-cluster-auth-ssl
     commands:
       - func: run server
         vars:
@@ -8176,19 +8128,7 @@ tasks:
           AUTH: auth
           SSL: ssl
     tags: [server-version]
-  - name: test-python3.13-standalone-noauth-nossl
-    commands:
-      - func: run server
-        vars:
-          TOPOLOGY: standalone
-          AUTH: noauth
-          SSL: nossl
-      - func: run tests
-        vars:
-          AUTH: noauth
-          SSL: nossl
-    tags: [server-version]
-  - name: test-python3.13-replica-set-noauth-ssl
+  - name: test-python3.11-replica-set-noauth-ssl
     commands:
       - func: run server
         vars:
@@ -8200,7 +8140,7 @@ tasks:
           AUTH: noauth
           SSL: ssl
     tags: [server-version]
-  - name: test-python3.13-sharded-cluster-auth-ssl
+  - name: test-python3.12-sharded-cluster-auth-ssl
     commands:
       - func: run server
         vars:
@@ -8212,19 +8152,7 @@ tasks:
           AUTH: auth
           SSL: ssl
     tags: [server-version]
-  - name: test-pypy3.10-standalone-noauth-nossl
-    commands:
-      - func: run server
-        vars:
-          TOPOLOGY: standalone
-          AUTH: noauth
-          SSL: nossl
-      - func: run tests
-        vars:
-          AUTH: noauth
-          SSL: nossl
-    tags: [server-version]
-  - name: test-pypy3.10-replica-set-noauth-ssl
+  - name: test-python3.13-replica-set-noauth-ssl
     commands:
       - func: run server
         vars:

.evergreen/scripts/generate_config.py

@@ -580,9 +580,11 @@ def create_aws_lambda_variants():
 
 def create_server_version_tasks():
     tasks = []
-    for python, topology in product(ALL_PYTHONS, TOPOLOGIES):
+    variants = [(p, "standalone") for p in ALL_PYTHONS]
+    for python, topology in zip_cycle(ALL_PYTHONS, ["replica_set", "sharded_cluster"]):
+        variants.append((python, topology))
+    for python, topology in variants:
         tags = ["server-version"]
-
         if topology == "standalone":
             auth = "noauth"
             ssl = "nossl"