Skip to content

Commit 7a4c3cb

Browse files
committed
test: use more expansions
1 parent fac9558 commit 7a4c3cb

File tree

2 files changed

+6
-46
lines changed

2 files changed

+6
-46
lines changed

.evergreen/config.in.yml

Lines changed: 3 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1266,20 +1266,12 @@ tasks:
12661266
params:
12671267
working_dir: src
12681268
binary: bash
1269+
add_expansions_to_env: true
12691270
args:
12701271
- ${DRIVERS_TOOLS}/.evergreen/aws_lambda/run-deployed-lambda-aws-tests.sh
12711272
env:
1272-
MONGODB_URI: ${MONGODB_URI}
12731273
TEST_LAMBDA_DIRECTORY: ${PROJECT_DIRECTORY}/test/lambda
1274-
DRIVERS_TOOLS: ${DRIVERS_TOOLS}
1275-
DRIVERS_ATLAS_PUBLIC_API_KEY: ${DRIVERS_ATLAS_PUBLIC_API_KEY}
1276-
DRIVERS_ATLAS_PRIVATE_API_KEY: ${DRIVERS_ATLAS_PRIVATE_API_KEY}
1277-
DRIVERS_ATLAS_GROUP_ID: ${DRIVERS_ATLAS_GROUP_ID}
1278-
LAMBDA_STACK_NAME: dbx-node-lambda
12791274
AWS_REGION: us-east-1
1280-
AWS_ACCESS_KEY_ID: ${AWS_ACCESS_KEY_ID}
1281-
AWS_SECRET_ACCESS_KEY: ${AWS_SECRET_ACCESS_KEY}
1282-
AWS_SESSION_TOKEN: ${AWS_SESSION_TOKEN}
12831275

12841276
task_groups:
12851277
- name: serverless_task_group
@@ -1419,16 +1411,9 @@ task_groups:
14191411
params:
14201412
working_dir: src
14211413
binary: bash
1414+
add_expansions_to_env: true
14221415
args:
14231416
- ${DRIVERS_TOOLS}/.evergreen/aws_lambda/setup-atlas-cluster.sh
1424-
env:
1425-
DRIVERS_TOOLS: ${DRIVERS_TOOLS}
1426-
DRIVERS_ATLAS_PUBLIC_API_KEY: ${DRIVERS_ATLAS_PUBLIC_API_KEY}
1427-
DRIVERS_ATLAS_PRIVATE_API_KEY: ${DRIVERS_ATLAS_PRIVATE_API_KEY}
1428-
DRIVERS_ATLAS_GROUP_ID: ${DRIVERS_ATLAS_GROUP_ID}
1429-
DRIVERS_ATLAS_LAMBDA_USER: ${DRIVERS_ATLAS_LAMBDA_USER}
1430-
DRIVERS_ATLAS_LAMBDA_PASSWORD: ${DRIVERS_ATLAS_LAMBDA_PASSWORD}
1431-
LAMBDA_STACK_NAME: dbx-node-lambda
14321417
- command: expansions.update
14331418
params:
14341419
file: src/atlas-expansion.yml
@@ -1437,14 +1422,9 @@ task_groups:
14371422
params:
14381423
working_dir: src
14391424
binary: bash
1425+
add_expansions_to_env: true
14401426
args:
14411427
- ${DRIVERS_TOOLS}/.evergreen/aws_lambda/teardown-atlas-cluster.sh
1442-
env:
1443-
DRIVERS_TOOLS: ${DRIVERS_TOOLS}
1444-
DRIVERS_ATLAS_PUBLIC_API_KEY: ${DRIVERS_ATLAS_PUBLIC_API_KEY}
1445-
DRIVERS_ATLAS_PRIVATE_API_KEY: ${DRIVERS_ATLAS_PRIVATE_API_KEY}
1446-
DRIVERS_ATLAS_GROUP_ID: ${DRIVERS_ATLAS_GROUP_ID}
1447-
LAMBDA_STACK_NAME: dbx-node-lambda
14481428
setup_group_can_fail_task: true
14491429
setup_group_timeout_secs: 1800
14501430
tasks:

.evergreen/config.yml

Lines changed: 3 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1190,20 +1190,12 @@ tasks:
11901190
params:
11911191
working_dir: src
11921192
binary: bash
1193+
add_expansions_to_env: true
11931194
args:
11941195
- ${DRIVERS_TOOLS}/.evergreen/aws_lambda/run-deployed-lambda-aws-tests.sh
11951196
env:
1196-
MONGODB_URI: ${MONGODB_URI}
11971197
TEST_LAMBDA_DIRECTORY: ${PROJECT_DIRECTORY}/test/lambda
1198-
DRIVERS_TOOLS: ${DRIVERS_TOOLS}
1199-
DRIVERS_ATLAS_PUBLIC_API_KEY: ${DRIVERS_ATLAS_PUBLIC_API_KEY}
1200-
DRIVERS_ATLAS_PRIVATE_API_KEY: ${DRIVERS_ATLAS_PRIVATE_API_KEY}
1201-
DRIVERS_ATLAS_GROUP_ID: ${DRIVERS_ATLAS_GROUP_ID}
1202-
LAMBDA_STACK_NAME: dbx-node-lambda
12031198
AWS_REGION: us-east-1
1204-
AWS_ACCESS_KEY_ID: ${AWS_ACCESS_KEY_ID}
1205-
AWS_SECRET_ACCESS_KEY: ${AWS_SECRET_ACCESS_KEY}
1206-
AWS_SESSION_TOKEN: ${AWS_SESSION_TOKEN}
12071199
- name: test-latest-server
12081200
tags:
12091201
- latest
@@ -3472,16 +3464,9 @@ task_groups:
34723464
params:
34733465
working_dir: src
34743466
binary: bash
3467+
add_expansions_to_env: true
34753468
args:
34763469
- ${DRIVERS_TOOLS}/.evergreen/aws_lambda/setup-atlas-cluster.sh
3477-
env:
3478-
DRIVERS_TOOLS: ${DRIVERS_TOOLS}
3479-
DRIVERS_ATLAS_PUBLIC_API_KEY: ${DRIVERS_ATLAS_PUBLIC_API_KEY}
3480-
DRIVERS_ATLAS_PRIVATE_API_KEY: ${DRIVERS_ATLAS_PRIVATE_API_KEY}
3481-
DRIVERS_ATLAS_GROUP_ID: ${DRIVERS_ATLAS_GROUP_ID}
3482-
DRIVERS_ATLAS_LAMBDA_USER: ${DRIVERS_ATLAS_LAMBDA_USER}
3483-
DRIVERS_ATLAS_LAMBDA_PASSWORD: ${DRIVERS_ATLAS_LAMBDA_PASSWORD}
3484-
LAMBDA_STACK_NAME: dbx-node-lambda
34853470
- command: expansions.update
34863471
params:
34873472
file: src/atlas-expansion.yml
@@ -3490,14 +3475,9 @@ task_groups:
34903475
params:
34913476
working_dir: src
34923477
binary: bash
3478+
add_expansions_to_env: true
34933479
args:
34943480
- ${DRIVERS_TOOLS}/.evergreen/aws_lambda/teardown-atlas-cluster.sh
3495-
env:
3496-
DRIVERS_TOOLS: ${DRIVERS_TOOLS}
3497-
DRIVERS_ATLAS_PUBLIC_API_KEY: ${DRIVERS_ATLAS_PUBLIC_API_KEY}
3498-
DRIVERS_ATLAS_PRIVATE_API_KEY: ${DRIVERS_ATLAS_PRIVATE_API_KEY}
3499-
DRIVERS_ATLAS_GROUP_ID: ${DRIVERS_ATLAS_GROUP_ID}
3500-
LAMBDA_STACK_NAME: dbx-node-lambda
35013481
setup_group_can_fail_task: true
35023482
setup_group_timeout_secs: 1800
35033483
tasks:

0 commit comments

Comments
 (0)