clean up aws tasks

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-regular-python3.10
     commands:
       - func: run server
         vars:
@@ -111,22 +111,25 @@ tasks:
       - func: run tests
         vars:
           TEST_NAME: auth_aws
-          SUB_TEST_NAME: ecs
+          SUB_TEST_NAME: regular
           PYTHON_VERSION: "3.10"
-    tags: [auth-aws, auth-aws-ecs]
-  - name: test-auth-aws-4.4-eks-python3.11
+    tags: [auth-aws, auth-aws-regular]
+  - name: test-auth-aws-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"
     tags: [auth-aws, auth-aws-eks]
+  - name: test-auth-aws-ecs
+    commands:
+      - func: assume ec2 role
+      - func: run tests
+        vars:
+          TEST_NAME: auth_aws
+          SUB_TEST_NAME: ecs
+    tags: [auth-aws, auth-aws-ecs]
 
   # Backport pr tests
   - name: backport-pr

.evergreen/scripts/generate_config.py

@@ -743,19 +743,18 @@ def create_aws_tasks():
         "env-creds",
         "session-creds",
         "web-identity",
-        "ecs",
-        "eks",
     ]
+    base_tags = ["auth-aws"]
+    assume_func = FunctionCall(func="assume ec2 role")
+
     for version, test_type, python in zip_cycle(get_versions_from("4.4"), aws_test_types, CPYTHONS):
         base_name = f"test-auth-aws-{version}"
-        base_tags = ["auth-aws"]
-        server_vars = dict(AUTH_AWS="1", VERSION=version)
-        server_func = FunctionCall(func="run server", vars=server_vars)
-        assume_func = FunctionCall(func="assume ec2 role")
         tags = [*base_tags, f"auth-aws-{test_type}"]
         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)
+        server_vars = dict(AUTH_AWS="1", VERSION=version)
+        server_func = FunctionCall(func="run server", vars=server_vars)
         funcs = [server_func, assume_func, test_func]
         tasks.append(EvgTask(name=name, tags=tags, commands=funcs))
 
@@ -772,6 +771,14 @@ def create_aws_tasks():
             funcs = [server_func, assume_func, test_func]
             tasks.append(EvgTask(name=name, tags=tags, commands=funcs))
 
+    for test_type in ["eks", "ecs"]:
+        name = get_task_name(f"test-auth-aws-{test_type}")
+        tags = [*base_tags, f"auth-aws-{test_type}"]
+        test_vars = dict(TEST_NAME="auth_aws", SUB_TEST_NAME=test_type)
+        test_func = FunctionCall(func="run tests", vars=test_vars)
+        funcs = [assume_func, test_func]
+        tasks.append(EvgTask(name=name, tags=tags, commands=funcs))
+
     return tasks