Skip to content

Commit d54bcc3

Browse files
committed
clean up aws auth server start
1 parent 83fc521 commit d54bcc3

File tree

3 files changed

+9
-25
lines changed

3 files changed

+9
-25
lines changed

.evergreen/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ functions:
206206
params:
207207
binary: bash
208208
include_expansions_in_env: [VERSION, TOPOLOGY, AUTH, SSL, ORCHESTRATION_FILE, LOAD_BALANCER,
209-
STORAGE_ENGINE, REQUIRE_API_VERSION, DRIVERS_TOOLS, TEST_CRYPT_SHARED]
209+
STORAGE_ENGINE, REQUIRE_API_VERSION, DRIVERS_TOOLS, TEST_CRYPT_SHARED, AUTH_AWS]
210210
args:
211211
- src/.evergreen/scripts/bootstrap-mongo-orchestration.sh
212212
- command: expansions.update

.evergreen/generated_configs/tasks.yml

Lines changed: 7 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@ tasks:
44
commands:
55
- func: bootstrap mongo-orchestration
66
vars:
7-
AUTH: auth
8-
ORCHESTRATION_FILE: auth-aws.json
9-
TOPOLOGY: server
7+
AUTH_AWS: "1"
108
VERSION: "4.4"
119
- func: assume ec2 role
1210
- func: run tests
@@ -47,9 +45,7 @@ tasks:
4745
commands:
4846
- func: bootstrap mongo-orchestration
4947
vars:
50-
AUTH: auth
51-
ORCHESTRATION_FILE: auth-aws.json
52-
TOPOLOGY: server
48+
AUTH_AWS: "1"
5349
VERSION: "5.0"
5450
- func: assume ec2 role
5551
- func: run tests
@@ -90,9 +86,7 @@ tasks:
9086
commands:
9187
- func: bootstrap mongo-orchestration
9288
vars:
93-
AUTH: auth
94-
ORCHESTRATION_FILE: auth-aws.json
95-
TOPOLOGY: server
89+
AUTH_AWS: "1"
9690
VERSION: "6.0"
9791
- func: assume ec2 role
9892
- func: run tests
@@ -133,9 +127,7 @@ tasks:
133127
commands:
134128
- func: bootstrap mongo-orchestration
135129
vars:
136-
AUTH: auth
137-
ORCHESTRATION_FILE: auth-aws.json
138-
TOPOLOGY: server
130+
AUTH_AWS: "1"
139131
VERSION: "7.0"
140132
- func: assume ec2 role
141133
- func: run tests
@@ -176,9 +168,7 @@ tasks:
176168
commands:
177169
- func: bootstrap mongo-orchestration
178170
vars:
179-
AUTH: auth
180-
ORCHESTRATION_FILE: auth-aws.json
181-
TOPOLOGY: server
171+
AUTH_AWS: "1"
182172
VERSION: "8.0"
183173
- func: assume ec2 role
184174
- func: run tests
@@ -219,9 +209,7 @@ tasks:
219209
commands:
220210
- func: bootstrap mongo-orchestration
221211
vars:
222-
AUTH: auth
223-
ORCHESTRATION_FILE: auth-aws.json
224-
TOPOLOGY: server
212+
AUTH_AWS: "1"
225213
VERSION: rapid
226214
- func: assume ec2 role
227215
- func: run tests
@@ -262,9 +250,7 @@ tasks:
262250
commands:
263251
- func: bootstrap mongo-orchestration
264252
vars:
265-
AUTH: auth
266-
ORCHESTRATION_FILE: auth-aws.json
267-
TOPOLOGY: server
253+
AUTH_AWS: "1"
268254
VERSION: latest
269255
- func: assume ec2 role
270256
- func: run tests

.evergreen/scripts/generate_config.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -855,9 +855,7 @@ def create_aws_tasks():
855855
for version in get_versions_from("4.4"):
856856
name = f"test-auth-aws-{version}"
857857
tags = ["auth-aws"]
858-
bootstrap_vars = dict(
859-
AUTH="auth", ORCHESTRATION_FILE="auth-aws.json", TOPOLOGY="server", VERSION=version
860-
)
858+
bootstrap_vars = dict(AUTH_AWS="1", VERSION=version)
861859
bootstrap_func = FunctionCall(func="bootstrap mongo-orchestration", vars=bootstrap_vars)
862860
assume_func = FunctionCall(func="assume ec2 role")
863861
test_funcs = []

0 commit comments

Comments
 (0)