reduce variants

Author: blink1073

.evergreen/generated_configs/tasks.yml

@@ -2491,28 +2491,6 @@ tasks:
       - standalone-noauth-nossl
       - sync
       - pr
-  - name: test-server-version-python3.10-async-noauth-nossl-standalone-cov
-    commands:
-      - func: run server
-        vars:
-          AUTH: noauth
-          SSL: nossl
-          TOPOLOGY: standalone
-          COVERAGE: "1"
-      - func: run tests
-        vars:
-          AUTH: noauth
-          SSL: nossl
-          TOPOLOGY: standalone
-          COVERAGE: "1"
-          PYTHON_VERSION: "3.10"
-          TEST_NAME: default_async
-    tags:
-      - server-version
-      - python-3.10
-      - standalone-noauth-nossl
-      - async
-      - pr
   - name: test-server-version-python3.11-sync-auth-ssl-replica-set-cov
     commands:
       - func: run server
@@ -2616,7 +2594,6 @@ tasks:
       - python-3.9
       - replica_set-noauth-ssl
       - sync
-      - pr
   - name: test-server-version-python3.10-async-noauth-ssl-replica-set-cov
     commands:
       - func: run server
@@ -2638,7 +2615,6 @@ tasks:
       - python-3.10
       - replica_set-noauth-ssl
       - async
-      - pr
   - name: test-server-version-python3.11-sync-noauth-nossl-replica-set-cov
     commands:
       - func: run server
@@ -2660,27 +2636,7 @@ tasks:
       - python-3.11
       - replica_set-noauth-nossl
       - sync
-  - name: test-server-version-python3.12-async-noauth-nossl-replica-set-cov
-    commands:
-      - func: run server
-        vars:
-          AUTH: noauth
-          SSL: nossl
-          TOPOLOGY: replica_set
-          COVERAGE: "1"
-      - func: run tests
-        vars:
-          AUTH: noauth
-          SSL: nossl
-          TOPOLOGY: replica_set
-          COVERAGE: "1"
-          PYTHON_VERSION: "3.12"
-          TEST_NAME: default_async
-    tags:
-      - server-version
-      - python-3.12
-      - replica_set-noauth-nossl
-      - async
+      - pr
   - name: test-server-version-python3.13-sync-auth-ssl-sharded-cluster-cov
     commands:
       - func: run server
@@ -2703,26 +2659,6 @@ tasks:
       - sharded_cluster-auth-ssl
       - sync
       - pr
-  - name: test-server-version-pypy3.10-async-auth-ssl-sharded-cluster
-    commands:
-      - func: run server
-        vars:
-          AUTH: auth
-          SSL: ssl
-          TOPOLOGY: sharded_cluster
-      - func: run tests
-        vars:
-          AUTH: auth
-          SSL: ssl
-          TOPOLOGY: sharded_cluster
-          PYTHON_VERSION: pypy3.10
-          TEST_NAME: default_async
-    tags:
-      - server-version
-      - python-pypy3.10
-      - sharded_cluster-auth-ssl
-      - async
-      - pr
   - name: test-server-version-python3.9-sync-auth-nossl-sharded-cluster-cov
     commands:
       - func: run server
@@ -2847,254 +2783,6 @@ tasks:
       - python-pypy3.10
       - sharded_cluster-noauth-nossl
       - async
-  - name: test-server-version-python3.9-sync-auth-ssl-sharded-cluster-cov
-    commands:
-      - func: run server
-        vars:
-          AUTH: auth
-          SSL: ssl
-          TOPOLOGY: sharded_cluster
-          COVERAGE: "1"
-      - func: run tests
-        vars:
-          AUTH: auth
-          SSL: ssl
-          TOPOLOGY: sharded_cluster
-          COVERAGE: "1"
-          PYTHON_VERSION: "3.9"
-          TEST_NAME: default_sync
-    tags:
-      - server-version
-      - python-3.9
-      - sharded_cluster-auth-ssl
-      - sync
-  - name: test-server-version-python3.9-async-auth-ssl-sharded-cluster-cov
-    commands:
-      - func: run server
-        vars:
-          AUTH: auth
-          SSL: ssl
-          TOPOLOGY: sharded_cluster
-          COVERAGE: "1"
-      - func: run tests
-        vars:
-          AUTH: auth
-          SSL: ssl
-          TOPOLOGY: sharded_cluster
-          COVERAGE: "1"
-          PYTHON_VERSION: "3.9"
-          TEST_NAME: default_async
-    tags:
-      - server-version
-      - python-3.9
-      - sharded_cluster-auth-ssl
-      - async
-  - name: test-server-version-python3.10-sync-auth-ssl-sharded-cluster-cov
-    commands:
-      - func: run server
-        vars:
-          AUTH: auth
-          SSL: ssl
-          TOPOLOGY: sharded_cluster
-          COVERAGE: "1"
-      - func: run tests
-        vars:
-          AUTH: auth
-          SSL: ssl
-          TOPOLOGY: sharded_cluster
-          COVERAGE: "1"
-          PYTHON_VERSION: "3.10"
-          TEST_NAME: default_sync
-    tags:
-      - server-version
-      - python-3.10
-      - sharded_cluster-auth-ssl
-      - sync
-  - name: test-server-version-python3.10-async-auth-ssl-sharded-cluster-cov
-    commands:
-      - func: run server
-        vars:
-          AUTH: auth
-          SSL: ssl
-          TOPOLOGY: sharded_cluster
-          COVERAGE: "1"
-      - func: run tests
-        vars:
-          AUTH: auth
-          SSL: ssl
-          TOPOLOGY: sharded_cluster
-          COVERAGE: "1"
-          PYTHON_VERSION: "3.10"
-          TEST_NAME: default_async
-    tags:
-      - server-version
-      - python-3.10
-      - sharded_cluster-auth-ssl
-      - async
-  - name: test-server-version-python3.11-sync-auth-ssl-sharded-cluster-cov
-    commands:
-      - func: run server
-        vars:
-          AUTH: auth
-          SSL: ssl
-          TOPOLOGY: sharded_cluster
-          COVERAGE: "1"
-      - func: run tests
-        vars:
-          AUTH: auth
-          SSL: ssl
-          TOPOLOGY: sharded_cluster
-          COVERAGE: "1"
-          PYTHON_VERSION: "3.11"
-          TEST_NAME: default_sync
-    tags:
-      - server-version
-      - python-3.11
-      - sharded_cluster-auth-ssl
-      - sync
-  - name: test-server-version-python3.11-async-auth-ssl-sharded-cluster-cov
-    commands:
-      - func: run server
-        vars:
-          AUTH: auth
-          SSL: ssl
-          TOPOLOGY: sharded_cluster
-          COVERAGE: "1"
-      - func: run tests
-        vars:
-          AUTH: auth
-          SSL: ssl
-          TOPOLOGY: sharded_cluster
-          COVERAGE: "1"
-          PYTHON_VERSION: "3.11"
-          TEST_NAME: default_async
-    tags:
-      - server-version
-      - python-3.11
-      - sharded_cluster-auth-ssl
-      - async
-  - name: test-server-version-python3.12-sync-auth-ssl-sharded-cluster-cov
-    commands:
-      - func: run server
-        vars:
-          AUTH: auth
-          SSL: ssl
-          TOPOLOGY: sharded_cluster
-          COVERAGE: "1"
-      - func: run tests
-        vars:
-          AUTH: auth
-          SSL: ssl
-          TOPOLOGY: sharded_cluster
-          COVERAGE: "1"
-          PYTHON_VERSION: "3.12"
-          TEST_NAME: default_sync
-    tags:
-      - server-version
-      - python-3.12
-      - sharded_cluster-auth-ssl
-      - sync
-  - name: test-server-version-python3.12-async-auth-ssl-sharded-cluster-cov
-    commands:
-      - func: run server
-        vars:
-          AUTH: auth
-          SSL: ssl
-          TOPOLOGY: sharded_cluster
-          COVERAGE: "1"
-      - func: run tests
-        vars:
-          AUTH: auth
-          SSL: ssl
-          TOPOLOGY: sharded_cluster
-          COVERAGE: "1"
-          PYTHON_VERSION: "3.12"
-          TEST_NAME: default_async
-    tags:
-      - server-version
-      - python-3.12
-      - sharded_cluster-auth-ssl
-      - async
-  - name: test-server-version-python3.13-sync-auth-ssl-sharded-cluster-cov
-    commands:
-      - func: run server
-        vars:
-          AUTH: auth
-          SSL: ssl
-          TOPOLOGY: sharded_cluster
-          COVERAGE: "1"
-      - func: run tests
-        vars:
-          AUTH: auth
-          SSL: ssl
-          TOPOLOGY: sharded_cluster
-          COVERAGE: "1"
-          PYTHON_VERSION: "3.13"
-          TEST_NAME: default_sync
-    tags:
-      - server-version
-      - python-3.13
-      - sharded_cluster-auth-ssl
-      - sync
-  - name: test-server-version-python3.13-async-auth-ssl-sharded-cluster-cov
-    commands:
-      - func: run server
-        vars:
-          AUTH: auth
-          SSL: ssl
-          TOPOLOGY: sharded_cluster
-          COVERAGE: "1"
-      - func: run tests
-        vars:
-          AUTH: auth
-          SSL: ssl
-          TOPOLOGY: sharded_cluster
-          COVERAGE: "1"
-          PYTHON_VERSION: "3.13"
-          TEST_NAME: default_async
-    tags:
-      - server-version
-      - python-3.13
-      - sharded_cluster-auth-ssl
-      - async
-  - name: test-server-version-pypy3.10-sync-auth-ssl-sharded-cluster
-    commands:
-      - func: run server
-        vars:
-          AUTH: auth
-          SSL: ssl
-          TOPOLOGY: sharded_cluster
-      - func: run tests
-        vars:
-          AUTH: auth
-          SSL: ssl
-          TOPOLOGY: sharded_cluster
-          PYTHON_VERSION: pypy3.10
-          TEST_NAME: default_sync
-    tags:
-      - server-version
-      - python-pypy3.10
-      - sharded_cluster-auth-ssl
-      - sync
-  - name: test-server-version-pypy3.10-async-auth-ssl-sharded-cluster
-    commands:
-      - func: run server
-        vars:
-          AUTH: auth
-          SSL: ssl
-          TOPOLOGY: sharded_cluster
-      - func: run tests
-        vars:
-          AUTH: auth
-          SSL: ssl
-          TOPOLOGY: sharded_cluster
-          PYTHON_VERSION: pypy3.10
-          TEST_NAME: default_async
-    tags:
-      - server-version
-      - python-pypy3.10
-      - sharded_cluster-auth-ssl
-      - async
 
   # Serverless tests
   - name: test-serverless

.evergreen/scripts/generate_config.py

@@ -544,24 +544,27 @@ def create_server_version_tasks():
     for (topology, auth, ssl, sync), python in zip_cycle(
         list(product(TOPOLOGIES, ["auth", "noauth"], ["ssl", "nossl"], SYNCS)), ALL_PYTHONS
     ):
-        combo = f"{topology}-{auth}-{ssl}"
-        pr = combo in [
-            "standalone-noauth-nossl",
-            "replica_set-noauth-ssl",
-            "sharded_cluster-auth-ssl",
-        ]
-        task_inputs.append((topology, auth, ssl, sync, python, pr))
+        task_inputs.append((topology, auth, ssl, sync, python))
 
     # Every python should be tested with sharded cluster, auth, ssl, with sync and async.
     for python, sync in product(ALL_PYTHONS, SYNCS):
-        task_input = ("sharded_cluster", "auth", "ssl", sync, python, False)
+        task_input = ("sharded_cluster", "auth", "ssl", sync, python)
         if task_input not in task_inputs:
             task_inputs.append(task_input)
 
     # Assemble the tasks.
-    for topology, auth, ssl, sync, python, pr in task_inputs:
-        tags = ["server-version", f"python-{python}", f"{topology}-{auth}-{ssl}", sync]
-        if pr:
+    seen = set()
+    for topology, auth, ssl, sync, python in task_inputs:
+        combo = f"{topology}-{auth}-{ssl}"
+        tags = ["server-version", f"python-{python}", combo, sync]
+        if combo in seen:
+            continue
+        if combo in [
+            "standalone-noauth-nossl",
+            "replica_set-noauth-nossl",
+            "sharded_cluster-auth-ssl",
+        ]:
+            seen.add(combo)
             tags.append("pr")
         expansions = dict(AUTH=auth, SSL=ssl, TOPOLOGY=topology)
         if python not in PYPYS: