pare down matrix

Author: blink1073

.evergreen/generated_configs/tasks.yml

@@ -8032,67 +8032,79 @@ tasks:
       - sync_async
 
   # Server version tests
-  - name: test-python3.9-standalone-noauth-nossl
+  - name: test-python3.9-sharded-cluster-auth-ssl
     commands:
       - func: run server
         vars:
-          TOPOLOGY: standalone
-          AUTH: noauth
-          SSL: nossl
+          TOPOLOGY: sharded_cluster
+          AUTH: auth
+          SSL: ssl
       - func: run tests
         vars:
-          AUTH: noauth
-          SSL: nossl
+          AUTH: auth
+          SSL: ssl
     tags: [server-version]
-  - name: test-python3.10-standalone-noauth-nossl
+  - name: test-python3.10-sharded-cluster-auth-ssl
     commands:
       - func: run server
         vars:
-          TOPOLOGY: standalone
-          AUTH: noauth
-          SSL: nossl
+          TOPOLOGY: sharded_cluster
+          AUTH: auth
+          SSL: ssl
       - func: run tests
         vars:
-          AUTH: noauth
-          SSL: nossl
+          AUTH: auth
+          SSL: ssl
     tags: [server-version]
-  - name: test-python3.11-standalone-noauth-nossl
+  - name: test-python3.11-sharded-cluster-auth-ssl
     commands:
       - func: run server
         vars:
-          TOPOLOGY: standalone
-          AUTH: noauth
-          SSL: nossl
+          TOPOLOGY: sharded_cluster
+          AUTH: auth
+          SSL: ssl
       - func: run tests
         vars:
-          AUTH: noauth
-          SSL: nossl
+          AUTH: auth
+          SSL: ssl
     tags: [server-version]
-  - name: test-python3.12-standalone-noauth-nossl
+  - name: test-python3.12-sharded-cluster-auth-ssl
     commands:
       - func: run server
         vars:
-          TOPOLOGY: standalone
-          AUTH: noauth
-          SSL: nossl
+          TOPOLOGY: sharded_cluster
+          AUTH: auth
+          SSL: ssl
       - func: run tests
         vars:
-          AUTH: noauth
-          SSL: nossl
+          AUTH: auth
+          SSL: ssl
     tags: [server-version]
-  - name: test-python3.13-standalone-noauth-nossl
+  - name: test-python3.13-sharded-cluster-auth-ssl
     commands:
       - func: run server
         vars:
-          TOPOLOGY: standalone
-          AUTH: noauth
-          SSL: nossl
+          TOPOLOGY: sharded_cluster
+          AUTH: auth
+          SSL: ssl
       - func: run tests
         vars:
-          AUTH: noauth
-          SSL: nossl
+          AUTH: auth
+          SSL: ssl
+    tags: [server-version]
+  - name: test-pypy3.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
     tags: [server-version]
-  - name: test-pypy3.10-standalone-noauth-nossl
+  - name: test-python3.9-standalone-noauth-nossl
     commands:
       - func: run server
         vars:
@@ -8104,7 +8116,7 @@ tasks:
           AUTH: noauth
           SSL: nossl
     tags: [server-version]
-  - name: test-python3.9-replica-set-noauth-ssl
+  - name: test-python3.10-replica-set-noauth-ssl
     commands:
       - func: run server
         vars:
@@ -8116,19 +8128,19 @@ tasks:
           AUTH: noauth
           SSL: ssl
     tags: [server-version]
-  - name: test-python3.10-sharded-cluster-auth-ssl
+  - name: test-python3.11-standalone-noauth-nossl
     commands:
       - func: run server
         vars:
-          TOPOLOGY: sharded_cluster
-          AUTH: auth
-          SSL: ssl
+          TOPOLOGY: standalone
+          AUTH: noauth
+          SSL: nossl
       - func: run tests
         vars:
-          AUTH: auth
-          SSL: ssl
+          AUTH: noauth
+          SSL: nossl
     tags: [server-version]
-  - name: test-python3.11-replica-set-noauth-ssl
+  - name: test-python3.12-replica-set-noauth-ssl
     commands:
       - func: run server
         vars:
@@ -8140,19 +8152,19 @@ tasks:
           AUTH: noauth
           SSL: ssl
     tags: [server-version]
-  - name: test-python3.12-sharded-cluster-auth-ssl
+  - name: test-python3.13-standalone-noauth-nossl
     commands:
       - func: run server
         vars:
-          TOPOLOGY: sharded_cluster
-          AUTH: auth
-          SSL: ssl
+          TOPOLOGY: standalone
+          AUTH: noauth
+          SSL: nossl
       - func: run tests
         vars:
-          AUTH: auth
-          SSL: ssl
+          AUTH: noauth
+          SSL: nossl
     tags: [server-version]
-  - name: test-python3.13-replica-set-noauth-ssl
+  - name: test-pypy3.10-replica-set-noauth-ssl
     commands:
       - func: run server
         vars:
@@ -8164,18 +8176,6 @@ tasks:
           AUTH: noauth
           SSL: ssl
     tags: [server-version]
-  - name: test-pypy3.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
-    tags: [server-version]
 
   # Serverless tests
   - name: test-serverless

.evergreen/scripts/generate_config.py

@@ -580,8 +580,8 @@ def create_aws_lambda_variants():
 
 def create_server_version_tasks():
     tasks = []
-    variants = [(p, "standalone") for p in ALL_PYTHONS]
-    for python, topology in zip_cycle(ALL_PYTHONS, ["replica_set", "sharded_cluster"]):
+    variants = [(p, "sharded_cluster") for p in ALL_PYTHONS]
+    for python, topology in zip_cycle(ALL_PYTHONS, ["standalone", "replica_set"]):
         variants.append((python, topology))
     for python, topology in variants:
         tags = ["server-version"]