cleanup

Author: blink1073

.evergreen/generated_configs/tasks.yml

@@ -101,7 +101,7 @@ tasks:
           AWS_ROLE_SESSION_NAME: test
           PYTHON_VERSION: "3.9"
     tags: [auth-aws, auth-aws-web-identity]
-  - name: test-auth-aws-latest-ecs-python3.10
+  - name: test-auth-aws-latest-ecs
     commands:
       - func: run server
         vars:
@@ -112,20 +112,16 @@ tasks:
         vars:
           TEST_NAME: auth_aws
           SUB_TEST_NAME: ecs
-          PYTHON_VERSION: "3.10"
+          PYTHON_VERSION: null
     tags: [auth-aws, auth-aws-ecs]
-  - name: test-auth-aws-4.4-eks-python3.11
+  - name: test-auth-aws-4.4-eks
     commands:
-      - func: run server
-        vars:
-          AUTH_AWS: "1"
-          VERSION: "4.4"
       - func: assume ec2 role
       - func: run tests
         vars:
           TEST_NAME: auth_aws
           SUB_TEST_NAME: eks
-          PYTHON_VERSION: "3.11"
+          PYTHON_VERSION: null
     tags: [auth-aws, auth-aws-eks]
 
   # Backport pr tests

.evergreen/scripts/generate_config.py

@@ -753,10 +753,14 @@ def create_aws_tasks():
         server_func = FunctionCall(func="run server", vars=server_vars)
         assume_func = FunctionCall(func="assume ec2 role")
         tags = [*base_tags, f"auth-aws-{test_type}"]
+        if test_type in ["eks", "ecs"]:
+            python = None  # noqa:PLW2901
         name = get_task_name(f"{base_name}-{test_type}", python=python)
         test_vars = dict(TEST_NAME="auth_aws", SUB_TEST_NAME=test_type, PYTHON_VERSION=python)
         test_func = FunctionCall(func="run tests", vars=test_vars)
         funcs = [server_func, assume_func, test_func]
+        if test_type == "eks":
+            funcs = [assume_func, test_func]
         tasks.append(EvgTask(name=name, tags=tags, commands=funcs))
 
         if test_type == "web-identity":

.evergreen/scripts/generate_config_utils.py

@@ -197,7 +197,7 @@ def get_common_name(base: str, sep: str, **kwargs) -> str:
         display_name = f"{display_name}{sep}{version}"
     for key, value in kwargs.items():
         name = value
-        if key.lower() == "python":
+        if key.lower() == "python" and value is not None:
             if not value.startswith("pypy"):
                 name = f"Python{value}"
             else: