cleanup

Author: blink1073

.evergreen/generated_configs/tasks.yml

@@ -1158,70 +1158,27 @@ tasks:
     tags: [load-balancer, noauth, nossl]
 
   # Min max tests
-  - name: test-v4.0-python3.9-noauth-nossl-standalone
+  - name: test-python3.9
     commands:
       - func: assume ec2 role
-      - func: run server
-        vars:
-          AUTH: noauth
-          SSL: nossl
-          TOPOLOGY: standalone
-          VERSION: "4.0"
       - func: run tests
         vars:
-          AUTH: noauth
-          SSL: nossl
-          TOPOLOGY: standalone
-          VERSION: "4.0"
           PYTHON_VERSION: "3.9"
-    tags:
-      - min-max-tests
-      - server-4.0
-      - python-3.9
-      - standalone-noauth-nossl
-  - name: test-latest-python3.13-auth-ssl-sharded-cluster
+    tags: [min-max-python, python-3.9]
+  - name: test-python3.13
     commands:
       - func: assume ec2 role
-      - func: run server
-        vars:
-          AUTH: auth
-          SSL: ssl
-          TOPOLOGY: sharded_cluster
-          VERSION: latest
       - func: run tests
         vars:
-          AUTH: auth
-          SSL: ssl
-          TOPOLOGY: sharded_cluster
-          VERSION: latest
           PYTHON_VERSION: "3.13"
-    tags:
-      - min-max-tests
-      - server-latest
-      - python-3.13
-      - sharded_cluster-auth-ssl
-  - name: test-v8.0-pypy3.10-noauth-ssl-replica-set
+    tags: [min-max-python, python-3.13]
+  - name: test-pypy3.10
     commands:
       - func: assume ec2 role
-      - func: run server
-        vars:
-          AUTH: noauth
-          SSL: ssl
-          TOPOLOGY: replica_set
-          VERSION: "8.0"
       - func: run tests
         vars:
-          AUTH: noauth
-          SSL: ssl
-          TOPOLOGY: replica_set
-          VERSION: "8.0"
           PYTHON_VERSION: pypy3.10
-    tags:
-      - min-max-tests
-      - server-8.0
-      - python-pypy3.10
-      - replica_set-noauth-ssl
-      - pypy
+    tags: [min-max-python, python-pypy3.10, pypy]
 
   # Mockupdb tests
   - name: test-mockupdb

.evergreen/generated_configs/variants.yml

@@ -61,7 +61,7 @@ buildvariants:
   # Atlas connect tests
   - name: atlas-connect-rhel8
     tasks:
-      - name: .min-max-tests
+      - name: .min-max-python
     display_name: Atlas connect RHEL8
     run_on:
       - rhel87-small

.evergreen/scripts/generate_config.py

@@ -16,7 +16,6 @@
     MIN_MAX_PYTHON,
     OTHER_HOSTS,
     PYPYS,
-    STABLE_VERSION,
     SUB_TASKS,
     SYNCS,
     TOPOLOGIES,
@@ -478,7 +477,7 @@ def create_atlas_connect_variants():
     host = DEFAULT_HOST
     return [
         create_variant(
-            [".min-max-tests"],
+            [".min-max-python"],
             get_variant_name("Atlas connect", host),
             host=DEFAULT_HOST,
         )
@@ -664,28 +663,18 @@ def create_server_tasks():
 
 def create_min_max_tasks():
     tasks = []
-    versions = [ALL_VERSIONS[0], ALL_VERSIONS[-1], STABLE_VERSION]
-    pythons = [*MIN_MAX_PYTHON, PYPYS[-1]]
-    topologies = ["standalone", "sharded_cluster", "replica_set"]
-    for version, python, topology in zip_cycle(versions, pythons, topologies):
-        auth = "auth" if topology == "sharded_cluster" else "noauth"
-        ssl = "nossl" if topology == "standalone" else "ssl"
+    for python in [*MIN_MAX_PYTHON, PYPYS[-1]]:
         tags = [
-            "min-max-tests",
-            f"server-{version}",
+            "min-max-python",
             f"python-{python}",
-            f"{topology}-{auth}-{ssl}",
         ]
         if "pypy" in python:
             tags.append("pypy")
-        expansions = dict(AUTH=auth, SSL=ssl, TOPOLOGY=topology, VERSION=version)
-        name = get_task_name("test", python=python, **expansions)
+        name = get_task_name("test", python=python)
         assume_func = FunctionCall(func="assume ec2 role")
-        server_func = FunctionCall(func="run server", vars=expansions)
-        test_vars = expansions.copy()
-        test_vars["PYTHON_VERSION"] = python
+        test_vars = dict(PYTHON_VERSION=python)
         test_func = FunctionCall(func="run tests", vars=test_vars)
-        commands = [assume_func, server_func, test_func]
+        commands = [assume_func, test_func]
         tasks.append(EvgTask(name=name, tags=tags, commands=commands))
     return tasks
 

.evergreen/scripts/generate_config_utils.py

@@ -22,7 +22,6 @@
 ##############
 
 ALL_VERSIONS = ["4.0", "4.2", "4.4", "5.0", "6.0", "7.0", "8.0", "rapid", "latest"]
-STABLE_VERSION = "8.0"
 CPYTHONS = ["3.9", "3.10", "3.11", "3.12", "3.13"]
 PYPYS = ["pypy3.10"]
 ALL_PYTHONS = CPYTHONS + PYPYS