cleanup

Author: blink1073

.evergreen/config.yml

@@ -270,6 +270,7 @@ functions:
       type: test
       params:
         working_dir: "src"
+        include_expansions_in_env: [AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY, AWS_SESSION_TOKEN]
         binary: bash
         args: [.evergreen/just.sh, run-tests]
 
@@ -421,13 +422,6 @@ functions:
           - .evergreen/scripts/cleanup.sh
 
   "teardown system":
-    - command: subprocess.exec
-      params:
-        binary: bash
-        working_dir: "src"
-        args:
-          # Ensure the instance profile is reassigned for aws tests.
-          - ${DRIVERS_TOOLS}/.evergreen/auth_aws/teardown.sh
     - command: subprocess.exec
       params:
         binary: bash

.evergreen/generated_configs/tasks.yml

@@ -39,6 +39,19 @@ tasks:
           SUB_TEST_NAME: web-identity
           AWS_ROLE_SESSION_NAME: test
     tags: [auth-aws, "4.4"]
+  - name: test-auth-aws-ecs-4.4
+    commands:
+      - func: bootstrap mongo-orchestration
+        vars:
+          AUTH: auth
+          ORCHESTRATION_FILE: auth-aws.json
+          TOPOLOGY: server
+          VERSION: "4.4"
+      - func: run tests
+        vars:
+          TEST_NAME: auth_aws
+          SUB_TEST_NAME: ecs
+    tags: [auth-aws-ecs]
   - name: test-auth-aws-5.0
     commands:
       - func: bootstrap mongo-orchestration
@@ -78,6 +91,19 @@ tasks:
           SUB_TEST_NAME: web-identity
           AWS_ROLE_SESSION_NAME: test
     tags: [auth-aws, "5.0"]
+  - name: test-auth-aws-ecs-5.0
+    commands:
+      - func: bootstrap mongo-orchestration
+        vars:
+          AUTH: auth
+          ORCHESTRATION_FILE: auth-aws.json
+          TOPOLOGY: server
+          VERSION: "5.0"
+      - func: run tests
+        vars:
+          TEST_NAME: auth_aws
+          SUB_TEST_NAME: ecs
+    tags: [auth-aws-ecs]
   - name: test-auth-aws-6.0
     commands:
       - func: bootstrap mongo-orchestration
@@ -117,6 +143,19 @@ tasks:
           SUB_TEST_NAME: web-identity
           AWS_ROLE_SESSION_NAME: test
     tags: [auth-aws, "6.0"]
+  - name: test-auth-aws-ecs-6.0
+    commands:
+      - func: bootstrap mongo-orchestration
+        vars:
+          AUTH: auth
+          ORCHESTRATION_FILE: auth-aws.json
+          TOPOLOGY: server
+          VERSION: "6.0"
+      - func: run tests
+        vars:
+          TEST_NAME: auth_aws
+          SUB_TEST_NAME: ecs
+    tags: [auth-aws-ecs]
   - name: test-auth-aws-7.0
     commands:
       - func: bootstrap mongo-orchestration
@@ -156,6 +195,19 @@ tasks:
           SUB_TEST_NAME: web-identity
           AWS_ROLE_SESSION_NAME: test
     tags: [auth-aws, "7.0"]
+  - name: test-auth-aws-ecs-7.0
+    commands:
+      - func: bootstrap mongo-orchestration
+        vars:
+          AUTH: auth
+          ORCHESTRATION_FILE: auth-aws.json
+          TOPOLOGY: server
+          VERSION: "7.0"
+      - func: run tests
+        vars:
+          TEST_NAME: auth_aws
+          SUB_TEST_NAME: ecs
+    tags: [auth-aws-ecs]
   - name: test-auth-aws-8.0
     commands:
       - func: bootstrap mongo-orchestration
@@ -195,6 +247,19 @@ tasks:
           SUB_TEST_NAME: web-identity
           AWS_ROLE_SESSION_NAME: test
     tags: [auth-aws, "8.0"]
+  - name: test-auth-aws-ecs-8.0
+    commands:
+      - func: bootstrap mongo-orchestration
+        vars:
+          AUTH: auth
+          ORCHESTRATION_FILE: auth-aws.json
+          TOPOLOGY: server
+          VERSION: "8.0"
+      - func: run tests
+        vars:
+          TEST_NAME: auth_aws
+          SUB_TEST_NAME: ecs
+    tags: [auth-aws-ecs]
   - name: test-auth-aws-rapid
     commands:
       - func: bootstrap mongo-orchestration
@@ -234,6 +299,19 @@ tasks:
           SUB_TEST_NAME: web-identity
           AWS_ROLE_SESSION_NAME: test
     tags: [auth-aws, rapid]
+  - name: test-auth-aws-ecs-rapid
+    commands:
+      - func: bootstrap mongo-orchestration
+        vars:
+          AUTH: auth
+          ORCHESTRATION_FILE: auth-aws.json
+          TOPOLOGY: server
+          VERSION: rapid
+      - func: run tests
+        vars:
+          TEST_NAME: auth_aws
+          SUB_TEST_NAME: ecs
+    tags: [auth-aws-ecs]
   - name: test-auth-aws-latest
     commands:
       - func: bootstrap mongo-orchestration
@@ -273,7 +351,7 @@ tasks:
           SUB_TEST_NAME: web-identity
           AWS_ROLE_SESSION_NAME: test
     tags: [auth-aws, latest]
-  - name: test-auth-aws-ecs
+  - name: test-auth-aws-ecs-latest
     commands:
       - func: bootstrap mongo-orchestration
         vars:

.evergreen/scripts/generate_config.py

@@ -865,11 +865,11 @@ def create_aws_tasks():
         funcs = [bootstrap_func, assume_func, *test_funcs]
         tasks.append(EvgTask(name=name, tags=tags, commands=funcs))
 
-    ecs_name = "test-auth-aws-ecs"
-    test_vars = dict(TEST_NAME="auth_aws", SUB_TEST_NAME="ecs")
-    ecs_func = FunctionCall(func="run tests", vars=test_vars)
-    tags = ["auth-aws-ecs"]
-    tasks.append(EvgTask(name=ecs_name, tags=tags, commands=[bootstrap_func, ecs_func]))
+        tags = ["auth-aws-ecs"]
+        name = f"test-auth-aws-ecs-{version}"
+        test_vars = dict(TEST_NAME="auth_aws", SUB_TEST_NAME="ecs")
+        ecs_func = FunctionCall(func="run tests", vars=test_vars)
+        tasks.append(EvgTask(name=name, tags=tags, commands=[bootstrap_func, ecs_func]))
     return tasks
 
 

.evergreen/scripts/teardown_tests.py

@@ -9,7 +9,7 @@
 
 LOGGER.info(f"Tearing down tests of type '{TEST_NAME}'...")
 
-# Shut down csfle servers if applicable
+# Shut down csfle servers if applicable.
 if TEST_NAME == "encryption":
     run_command(f"bash {DRIVERS_TOOLS}/.evergreen/csfle/stop-servers.sh")
 
@@ -23,4 +23,8 @@
 
     teardown_kms(SUB_TEST_NAME)
 
+# Tear down auth_aws if applicable.
+elif TEST_NAME == "auth_aws":
+    run_command(f"bash {DRIVERS_TOOLS}/.evergreen/auth_aws/teardown.sh")
+
 LOGGER.info(f"Tearing down tests of type '{TEST_NAME}'... done.")