clean up tags

Author: blink1073

.evergreen/generated_configs/tasks.yml

@@ -8035,7 +8035,7 @@ tasks:
           TOPOLOGY: sharded_cluster
           COVERAGE: "1"
           PYTHON_VERSION: "3.9"
-    tags: [server-version, "3.9", sharded_cluster-auth-ssl]
+    tags: [server-version, python-3.9, sharded_cluster-auth-ssl]
   - name: test-python3.10-auth-ssl-sharded-cluster-cov
     commands:
       - func: run server
@@ -8051,7 +8051,7 @@ tasks:
           TOPOLOGY: sharded_cluster
           COVERAGE: "1"
           PYTHON_VERSION: "3.10"
-    tags: [server-version, "3.10", sharded_cluster-auth-ssl]
+    tags: [server-version, python-3.10, sharded_cluster-auth-ssl]
   - name: test-python3.11-auth-ssl-sharded-cluster-cov
     commands:
       - func: run server
@@ -8067,7 +8067,7 @@ tasks:
           TOPOLOGY: sharded_cluster
           COVERAGE: "1"
           PYTHON_VERSION: "3.11"
-    tags: [server-version, "3.11", sharded_cluster-auth-ssl]
+    tags: [server-version, python-3.11, sharded_cluster-auth-ssl]
   - name: test-python3.12-auth-ssl-sharded-cluster-cov
     commands:
       - func: run server
@@ -8083,7 +8083,7 @@ tasks:
           TOPOLOGY: sharded_cluster
           COVERAGE: "1"
           PYTHON_VERSION: "3.12"
-    tags: [server-version, "3.12", sharded_cluster-auth-ssl]
+    tags: [server-version, python-3.12, sharded_cluster-auth-ssl]
   - name: test-python3.13-auth-ssl-sharded-cluster-cov
     commands:
       - func: run server
@@ -8099,7 +8099,7 @@ tasks:
           TOPOLOGY: sharded_cluster
           COVERAGE: "1"
           PYTHON_VERSION: "3.13"
-    tags: [server-version, "3.13", sharded_cluster-auth-ssl]
+    tags: [server-version, python-3.13, sharded_cluster-auth-ssl]
   - name: test-pypy3.10-auth-ssl-sharded-cluster
     commands:
       - func: run server
@@ -8113,7 +8113,7 @@ tasks:
           SSL: ssl
           TOPOLOGY: sharded_cluster
           PYTHON_VERSION: pypy3.10
-    tags: [server-version, pypy3.10, sharded_cluster-auth-ssl]
+    tags: [server-version, python-pypy3.10, sharded_cluster-auth-ssl]
   - name: test-python3.9-auth-ssl-standalone-cov
     commands:
       - func: run server
@@ -8129,7 +8129,7 @@ tasks:
           TOPOLOGY: standalone
           COVERAGE: "1"
           PYTHON_VERSION: "3.9"
-    tags: [server-version, "3.9", standalone-auth-ssl]
+    tags: [server-version, python-3.9, standalone-auth-ssl]
   - name: test-python3.10-auth-nossl-standalone-cov
     commands:
       - func: run server
@@ -8145,7 +8145,7 @@ tasks:
           TOPOLOGY: standalone
           COVERAGE: "1"
           PYTHON_VERSION: "3.10"
-    tags: [server-version, "3.10", standalone-auth-nossl]
+    tags: [server-version, python-3.10, standalone-auth-nossl]
   - name: test-python3.11-noauth-ssl-standalone-cov
     commands:
       - func: run server
@@ -8161,7 +8161,7 @@ tasks:
           TOPOLOGY: standalone
           COVERAGE: "1"
           PYTHON_VERSION: "3.11"
-    tags: [server-version, "3.11", standalone-noauth-ssl]
+    tags: [server-version, python-3.11, standalone-noauth-ssl]
   - name: test-python3.12-noauth-nossl-standalone-cov
     commands:
       - func: run server
@@ -8177,7 +8177,7 @@ tasks:
           TOPOLOGY: standalone
           COVERAGE: "1"
           PYTHON_VERSION: "3.12"
-    tags: [server-version, "3.12", standalone-noauth-nossl]
+    tags: [server-version, python-3.12, standalone-noauth-nossl]
   - name: test-python3.13-auth-ssl-replica-set-cov
     commands:
       - func: run server
@@ -8193,7 +8193,7 @@ tasks:
           TOPOLOGY: replica_set
           COVERAGE: "1"
           PYTHON_VERSION: "3.13"
-    tags: [server-version, "3.13", replica_set-auth-ssl]
+    tags: [server-version, python-3.13, replica_set-auth-ssl]
   - name: test-pypy3.10-auth-nossl-replica-set
     commands:
       - func: run server
@@ -8207,7 +8207,7 @@ tasks:
           SSL: nossl
           TOPOLOGY: replica_set
           PYTHON_VERSION: pypy3.10
-    tags: [server-version, pypy3.10, replica_set-auth-nossl]
+    tags: [server-version, python-pypy3.10, replica_set-auth-nossl]
   - name: test-python3.9-noauth-ssl-replica-set-cov
     commands:
       - func: run server
@@ -8223,7 +8223,7 @@ tasks:
           TOPOLOGY: replica_set
           COVERAGE: "1"
           PYTHON_VERSION: "3.9"
-    tags: [server-version, "3.9", replica_set-noauth-ssl]
+    tags: [server-version, python-3.9, replica_set-noauth-ssl]
   - name: test-python3.10-noauth-nossl-replica-set-cov
     commands:
       - func: run server
@@ -8239,7 +8239,7 @@ tasks:
           TOPOLOGY: replica_set
           COVERAGE: "1"
           PYTHON_VERSION: "3.10"
-    tags: [server-version, "3.10", replica_set-noauth-nossl]
+    tags: [server-version, python-3.10, replica_set-noauth-nossl]
   - name: test-python3.12-auth-nossl-sharded-cluster-cov
     commands:
       - func: run server
@@ -8255,7 +8255,7 @@ tasks:
           TOPOLOGY: sharded_cluster
           COVERAGE: "1"
           PYTHON_VERSION: "3.12"
-    tags: [server-version, "3.12", sharded_cluster-auth-nossl]
+    tags: [server-version, python-3.12, sharded_cluster-auth-nossl]
   - name: test-python3.13-noauth-ssl-sharded-cluster-cov
     commands:
       - func: run server
@@ -8271,7 +8271,7 @@ tasks:
           TOPOLOGY: sharded_cluster
           COVERAGE: "1"
           PYTHON_VERSION: "3.13"
-    tags: [server-version, "3.13", sharded_cluster-noauth-ssl]
+    tags: [server-version, python-3.13, sharded_cluster-noauth-ssl]
   - name: test-pypy3.10-noauth-nossl-sharded-cluster
     commands:
       - func: run server
@@ -8285,7 +8285,7 @@ tasks:
           SSL: nossl
           TOPOLOGY: sharded_cluster
           PYTHON_VERSION: pypy3.10
-    tags: [server-version, pypy3.10, sharded_cluster-noauth-nossl]
+    tags: [server-version, python-pypy3.10, sharded_cluster-noauth-nossl]
 
   # Serverless tests
   - name: test-serverless
@@ -8317,8 +8317,9 @@ tasks:
     tags:
       - standard-non-linux
       - server-4.0
-      - "3.9"
+      - python-3.9
       - standalone-noauth-nossl
+      - sync
   - name: test-v4.2-python3.10-async-noauth-ssl-replica-set
     commands:
       - func: run server
@@ -8338,8 +8339,9 @@ tasks:
     tags:
       - standard-non-linux
       - server-4.2
-      - "3.10"
+      - python-3.10
       - replica_set-noauth-ssl
+      - async
   - name: test-v4.4-python3.11-sync-auth-ssl-sharded-cluster
     commands:
       - func: run server
@@ -8359,8 +8361,9 @@ tasks:
     tags:
       - standard-non-linux
       - server-4.4
-      - "3.11"
+      - python-3.11
       - sharded_cluster-auth-ssl
+      - sync
   - name: test-v5.0-python3.12-async-noauth-nossl-standalone
     commands:
       - func: run server
@@ -8380,8 +8383,9 @@ tasks:
     tags:
       - standard-non-linux
       - server-5.0
-      - "3.12"
+      - python-3.12
       - standalone-noauth-nossl
+      - async
   - name: test-v6.0-python3.13-sync-noauth-ssl-replica-set
     commands:
       - func: run server
@@ -8401,8 +8405,9 @@ tasks:
     tags:
       - standard-non-linux
       - server-6.0
-      - "3.13"
+      - python-3.13
       - replica_set-noauth-ssl
+      - sync
   - name: test-v7.0-python3.9-async-auth-ssl-sharded-cluster
     commands:
       - func: run server
@@ -8422,8 +8427,9 @@ tasks:
     tags:
       - standard-non-linux
       - server-7.0
-      - "3.9"
+      - python-3.9
       - sharded_cluster-auth-ssl
+      - async
   - name: test-v8.0-python3.10-sync-noauth-nossl-standalone
     commands:
       - func: run server
@@ -8443,8 +8449,9 @@ tasks:
     tags:
       - standard-non-linux
       - server-8.0
-      - "3.10"
+      - python-3.10
       - standalone-noauth-nossl
+      - sync
   - name: test-rapid-python3.11-async-noauth-ssl-replica-set
     commands:
       - func: run server
@@ -8464,8 +8471,9 @@ tasks:
     tags:
       - standard-non-linux
       - server-rapid
-      - "3.11"
+      - python-3.11
       - replica_set-noauth-ssl
+      - async
   - name: test-latest-python3.12-sync-auth-ssl-sharded-cluster
     commands:
       - func: run server
@@ -8485,5 +8493,6 @@ tasks:
     tags:
       - standard-non-linux
       - server-latest
-      - "3.12"
+      - python-3.12
       - sharded_cluster-auth-ssl
+      - sync

.evergreen/scripts/generate_config.py

@@ -591,7 +591,7 @@ def create_server_version_tasks():
             continue
         task_types.append((python, topology, auth, ssl))
     for python, topology, auth, ssl in task_types:
-        tags = ["server-version", python, f"{topology}-{auth}-{ssl}"]
+        tags = ["server-version", f"python-{python}", f"{topology}-{auth}-{ssl}"]
         expansions = dict(AUTH=auth, SSL=ssl, TOPOLOGY=topology)
         if python not in PYPYS:
             expansions["COVERAGE"] = "1"
@@ -609,7 +609,13 @@ def create_standard_non_linux_tasks():
     for version, python, topology, sync in zip_cycle(ALL_VERSIONS, CPYTHONS, TOPOLOGIES, SYNCS):
         auth = "auth" if topology == "sharded_cluster" else "noauth"
         ssl = "nossl" if topology == "standalone" else "ssl"
-        tags = ["standard-non-linux", f"server-{version}", python, f"{topology}-{auth}-{ssl}"]
+        tags = [
+            "standard-non-linux",
+            f"server-{version}",
+            f"python-{python}",
+            f"{topology}-{auth}-{ssl}",
+            sync,
+        ]
         expansions = dict(AUTH=auth, SSL=ssl, TOPOLOGY=topology, VERSION=version)
         name = get_task_name("test", python=python, sync=sync, **expansions)
         server_func = FunctionCall(func="run server", vars=expansions)