cleanup

Author: blink1073

.evergreen/generated_configs/tasks.yml

@@ -87,26 +87,26 @@ tasks:
           SUB_TEST_NAME: web-identity
           PYTHON_VERSION: "3.9"
     tags: [auth-aws, auth-aws-web-identity]
-  - name: test-auth-aws-rapid-web-identity-session-name-python3.9
+  - name: test-auth-aws-latest-web-identity-session-name-python3.10
     commands:
       - func: run server
         vars:
           AUTH_AWS: "1"
-          VERSION: rapid
+          VERSION: latest
       - func: assume ec2 role
       - func: run tests
         vars:
           TEST_NAME: auth_aws
-          SUB_TEST_NAME: web-identity
+          SUB_TEST_NAME: web-identity-session-name
+          PYTHON_VERSION: "3.10"
           AWS_ROLE_SESSION_NAME: test
-          PYTHON_VERSION: "3.9"
     tags: [auth-aws, auth-aws-web-identity]
-  - name: test-auth-aws-ecs
+  - name: test-auth-aws-4.4-ecs
     commands:
       - func: run server
         vars:
           AUTH_AWS: "1"
-          VERSION: latest
+          VERSION: "4.4"
       - func: assume ec2 role
       - func: run tests
         vars:
@@ -121,7 +121,6 @@ tasks:
         vars:
           TEST_NAME: auth_aws
           SUB_TEST_NAME: eks
-          PYTHON_VERSION: null
     tags: [auth-aws, auth-aws-eks]
 
   # Backport pr tests

.evergreen/scripts/generate_config.py

@@ -743,39 +743,34 @@ def create_aws_tasks():
         "env-creds",
         "session-creds",
         "web-identity",
+        "web-identity-session-name",
         "ecs",
-        "eks",
     ]
+    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}"]
-        if test_type in ["eks", "ecs"]:
+        if test_type == "ecs":
             python = None  # noqa:PLW2901
-            base_name = "test-auth-aws"
         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)
+        if test_type == "web-identity-session-name":
+            test_type = "web-identity"  # noqa:PLW2901
+            test_vars["AWS_ROLE_SESSION_NAME"] = "test"
+        tags = [*base_tags, f"auth-aws-{test_type}"]
         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":
-            tags = [*base_tags, "auth-aws-web-identity"]
-            name = get_task_name(f"{base_name}-web-identity-session-name", python=python)
-            test_vars = dict(
-                TEST_NAME="auth_aws",
-                SUB_TEST_NAME="web-identity",
-                AWS_ROLE_SESSION_NAME="test",
-                PYTHON_VERSION=python,
-            )
-            test_func = FunctionCall(func="run tests", vars=test_vars)
-            funcs = [server_func, assume_func, test_func]
-            tasks.append(EvgTask(name=name, tags=tags, commands=funcs))
+    # The EKS test does not start a server
+    tags = ["auth-aws", "auth-aws-eks"]
+    name = get_task_name("test-auth-aws-eks")
+    test_vars = dict(TEST_NAME="auth_aws", SUB_TEST_NAME="eks")
+    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
 

.evergreen/scripts/run-aws-container-test.sh

@@ -22,8 +22,8 @@ set -o xtrace
 # Install python with pip.
 PYTHON_VER="python3.11"
 apt-get -qq update  < /dev/null > /dev/null
-apt-get -qq install software-properties-common -y  # needed for apt-add-repository
-add-apt-repository -qq ppa:deadsnakes/ppa -y
+apt-get -qq install software-properties-common -y < /dev/null > /dev/null  # needed for apt-add-repository
+add-apt-repository -ppa:deadsnakes/ppa -y
 apt-get -qq update  < /dev/null > /dev/null
 apt-get -qq install $PYTHON_VER $PYTHON_VER-venv build-essential $PYTHON_VER-dev -y  < /dev/null > /dev/null