Skip to content

Commit a413ada

Browse files
committed
cleanup
1 parent b54a274 commit a413ada

File tree

2 files changed

+6
-8
lines changed

2 files changed

+6
-8
lines changed

.evergreen/generated_configs/tasks.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -108,19 +108,18 @@ tasks:
108108
vars:
109109
TEST_NAME: auth_aws
110110
SUB_TEST_NAME: eks
111-
tags: [auth-aws, auth-aws-eks]
112-
- name: test-auth-aws-ecs-latest
111+
tags: [auth-aws, auth-aws-eks-latest]
112+
- name: test-auth-aws-ecs
113113
commands:
114114
- func: assume ec2 role
115115
- func: run server
116116
vars:
117117
AUTH_AWS: "1"
118-
VERSION: latest
119118
- func: run tests
120119
vars:
121120
TEST_NAME: auth_aws
122121
SUB_TEST_NAME: ecs
123-
tags: [auth-aws, auth-aws-ecs]
122+
tags: [auth-aws, auth-aws-ecs-latest]
124123

125124
# Backport pr tests
126125
- name: backport-pr

.evergreen/scripts/generate_config.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -762,17 +762,16 @@ def create_aws_tasks():
762762
tasks.append(EvgTask(name=name, tags=tags, commands=funcs))
763763

764764
for test_type in ["eks", "ecs"]:
765-
tags = ["auth-aws", f"auth-aws-{test_type}"]
765+
tags = ["auth-aws", f"auth-aws-{test_type}-latest"]
766766
base_name = f"test-auth-aws-{test_type}"
767+
name = get_task_name(base_name)
767768
test_vars = dict(TEST_NAME="auth_aws", SUB_TEST_NAME=test_type)
768769
test_func = FunctionCall(func="run tests", vars=test_vars)
769770
funcs = [assume_func, test_func]
770771
if test_type == "ecs":
771-
server_vars = dict(AUTH_AWS="1", VERSION=version)
772+
server_vars = dict(AUTH_AWS="1")
772773
server_func = FunctionCall(func="run server", vars=server_vars)
773-
base_name += "-latest"
774774
funcs = [assume_func, server_func, test_func]
775-
name = get_task_name(base_name)
776775
tasks.append(EvgTask(name=name, tags=tags, commands=funcs))
777776

778777
return tasks

0 commit comments

Comments
 (0)