From 8bd2618cdad51b45757783ebb877de0d32dd1c1a Mon Sep 17 00:00:00 2001 From: Durran Jordan Date: Thu, 22 Jun 2023 18:13:35 +0200 Subject: [PATCH 01/11] test(NODE-5361): use task groups for lambda --- .evergreen/config.in.yml | 85 ++++++++++++++++------- .evergreen/config.yml | 96 +++++++++++++++++--------- .evergreen/generate_evergreen_tasks.js | 20 +++--- 3 files changed, 133 insertions(+), 68 deletions(-) diff --git a/.evergreen/config.in.yml b/.evergreen/config.in.yml index b6cbe69472..34a5f5f958 100644 --- a/.evergreen/config.in.yml +++ b/.evergreen/config.in.yml @@ -182,31 +182,6 @@ functions: PROJECT_DIRECTORY="${PROJECT_DIRECTORY}" \ bash ${PROJECT_DIRECTORY}/.evergreen/run-oidc-tests.sh - "run deployed aws lambda tests": - - command: ec2.assume_role - params: - role_arn: ${LAMBDA_AWS_ROLE_ARN} - duration_seconds: 3600 - - command: subprocess.exec - params: - working_dir: src - binary: bash - args: - - .evergreen/run-deployed-lambda-aws-tests.sh - env: - TEST_LAMBDA_DIRECTORY: ${PROJECT_DIRECTORY}/test/lambda - DRIVERS_TOOLS: ${DRIVERS_TOOLS} - DRIVERS_ATLAS_PUBLIC_API_KEY: ${DRIVERS_ATLAS_PUBLIC_API_KEY} - DRIVERS_ATLAS_PRIVATE_API_KEY: ${DRIVERS_ATLAS_PRIVATE_API_KEY} - DRIVERS_ATLAS_LAMBDA_USER: ${DRIVERS_ATLAS_LAMBDA_USER} - DRIVERS_ATLAS_LAMBDA_PASSWORD: ${DRIVERS_ATLAS_LAMBDA_PASSWORD} - DRIVERS_ATLAS_GROUP_ID: ${DRIVERS_ATLAS_GROUP_ID} - LAMBDA_STACK_NAME: dbx-node-lambda - AWS_REGION: us-east-1 - AWS_ACCESS_KEY_ID: ${AWS_ACCESS_KEY_ID} - AWS_SECRET_ACCESS_KEY: ${AWS_SECRET_ACCESS_KEY} - AWS_SESSION_TOKEN: ${AWS_SESSION_TOKEN} - "run tests": - command: shell.exec type: test @@ -1280,6 +1255,33 @@ tasks: args: - .evergreen/run-oidc-tests-azure.sh + - name: "test-aws-lambda-deployed" + commands: + - func: "install dependencies" + - command: ec2.assume_role + params: + role_arn: ${LAMBDA_AWS_ROLE_ARN} + duration_seconds: 3600 + - command: subprocess.exec + params: + working_dir: src + binary: bash + args: + - ${DRIVERS_TOOLS}/aws_lambda/run-deployed-lambda-aws-tests.sh + env: + TEST_LAMBDA_DIRECTORY: ${PROJECT_DIRECTORY}/test/lambda + DRIVERS_TOOLS: ${DRIVERS_TOOLS} + DRIVERS_ATLAS_PUBLIC_API_KEY: ${DRIVERS_ATLAS_PUBLIC_API_KEY} + DRIVERS_ATLAS_PRIVATE_API_KEY: ${DRIVERS_ATLAS_PRIVATE_API_KEY} + DRIVERS_ATLAS_LAMBDA_USER: ${DRIVERS_ATLAS_LAMBDA_USER} + DRIVERS_ATLAS_LAMBDA_PASSWORD: ${DRIVERS_ATLAS_LAMBDA_PASSWORD} + DRIVERS_ATLAS_GROUP_ID: ${DRIVERS_ATLAS_GROUP_ID} + LAMBDA_STACK_NAME: dbx-node-lambda + AWS_REGION: us-east-1 + AWS_ACCESS_KEY_ID: ${AWS_ACCESS_KEY_ID} + AWS_SECRET_ACCESS_KEY: ${AWS_SECRET_ACCESS_KEY} + AWS_SESSION_TOKEN: ${AWS_SESSION_TOKEN} + task_groups: - name: serverless_task_group setup_group_can_fail_task: true @@ -1411,6 +1413,39 @@ task_groups: tasks: - oidc-auth-test-azure-latest + - name: test_aws_lambda_task_group + setup_group: + - func: fetch source + - command: subprocess.exec + params: + working_dir: src + binary: bash + args: + - ${DRIVERS_TOOLS}/aws_lambda/teardown-atlas-cluster.sh + env: + DRIVERS_TOOLS: ${DRIVERS_TOOLS} + DRIVERS_ATLAS_PUBLIC_API_KEY: ${DRIVERS_ATLAS_PUBLIC_API_KEY} + DRIVERS_ATLAS_PRIVATE_API_KEY: ${DRIVERS_ATLAS_PRIVATE_API_KEY} + DRIVERS_ATLAS_GROUP_ID: ${DRIVERS_ATLAS_GROUP_ID} + LAMBDA_STACK_NAME: dbx-node-lambda + teardown_group: + - command: subprocess.exec + params: + working_dir: src + binary: bash + args: + - ${DRIVERS_TOOLS}/aws_lambda/teardown-atlas-cluster.sh + env: + DRIVERS_TOOLS: ${DRIVERS_TOOLS} + DRIVERS_ATLAS_PUBLIC_API_KEY: ${DRIVERS_ATLAS_PUBLIC_API_KEY} + DRIVERS_ATLAS_PRIVATE_API_KEY: ${DRIVERS_ATLAS_PRIVATE_API_KEY} + DRIVERS_ATLAS_GROUP_ID: ${DRIVERS_ATLAS_GROUP_ID} + LAMBDA_STACK_NAME: dbx-node-lambda + setup_group_can_fail_task: true + setup_group_timeout_secs: 1800 + tasks: + - test-aws-lambda-deployed + pre: - func: "fetch source" - func: "windows fix" diff --git a/.evergreen/config.yml b/.evergreen/config.yml index 90809f8e67..b7f905ea28 100644 --- a/.evergreen/config.yml +++ b/.evergreen/config.yml @@ -151,30 +151,6 @@ functions: AWS_WEB_IDENTITY_TOKEN_FILE="/tmp/tokens/test_user1" \ PROJECT_DIRECTORY="${PROJECT_DIRECTORY}" \ bash ${PROJECT_DIRECTORY}/.evergreen/run-oidc-tests.sh - run deployed aws lambda tests: - - command: ec2.assume_role - params: - role_arn: ${LAMBDA_AWS_ROLE_ARN} - duration_seconds: 3600 - - command: subprocess.exec - params: - working_dir: src - binary: bash - args: - - .evergreen/run-deployed-lambda-aws-tests.sh - env: - TEST_LAMBDA_DIRECTORY: ${PROJECT_DIRECTORY}/test/lambda - DRIVERS_TOOLS: ${DRIVERS_TOOLS} - DRIVERS_ATLAS_PUBLIC_API_KEY: ${DRIVERS_ATLAS_PUBLIC_API_KEY} - DRIVERS_ATLAS_PRIVATE_API_KEY: ${DRIVERS_ATLAS_PRIVATE_API_KEY} - DRIVERS_ATLAS_LAMBDA_USER: ${DRIVERS_ATLAS_LAMBDA_USER} - DRIVERS_ATLAS_LAMBDA_PASSWORD: ${DRIVERS_ATLAS_LAMBDA_PASSWORD} - DRIVERS_ATLAS_GROUP_ID: ${DRIVERS_ATLAS_GROUP_ID} - LAMBDA_STACK_NAME: dbx-node-lambda - AWS_REGION: us-east-1 - AWS_ACCESS_KEY_ID: ${AWS_ACCESS_KEY_ID} - AWS_SECRET_ACCESS_KEY: ${AWS_SECRET_ACCESS_KEY} - AWS_SESSION_TOKEN: ${AWS_SESSION_TOKEN} run tests: - command: shell.exec type: test @@ -1203,6 +1179,32 @@ tasks: PROVIDER_NAME: azure args: - .evergreen/run-oidc-tests-azure.sh + - name: test-aws-lambda-deployed + commands: + - func: install dependencies + - command: ec2.assume_role + params: + role_arn: ${LAMBDA_AWS_ROLE_ARN} + duration_seconds: 3600 + - command: subprocess.exec + params: + working_dir: src + binary: bash + args: + - ${DRIVERS_TOOLS}/aws_lambda/run-deployed-lambda-aws-tests.sh + env: + TEST_LAMBDA_DIRECTORY: ${PROJECT_DIRECTORY}/test/lambda + DRIVERS_TOOLS: ${DRIVERS_TOOLS} + DRIVERS_ATLAS_PUBLIC_API_KEY: ${DRIVERS_ATLAS_PUBLIC_API_KEY} + DRIVERS_ATLAS_PRIVATE_API_KEY: ${DRIVERS_ATLAS_PRIVATE_API_KEY} + DRIVERS_ATLAS_LAMBDA_USER: ${DRIVERS_ATLAS_LAMBDA_USER} + DRIVERS_ATLAS_LAMBDA_PASSWORD: ${DRIVERS_ATLAS_LAMBDA_PASSWORD} + DRIVERS_ATLAS_GROUP_ID: ${DRIVERS_ATLAS_GROUP_ID} + LAMBDA_STACK_NAME: dbx-node-lambda + AWS_REGION: us-east-1 + AWS_ACCESS_KEY_ID: ${AWS_ACCESS_KEY_ID} + AWS_SECRET_ACCESS_KEY: ${AWS_SECRET_ACCESS_KEY} + AWS_SESSION_TOKEN: ${AWS_SESSION_TOKEN} - name: test-latest-server tags: - latest @@ -3140,13 +3142,6 @@ tasks: VERSION: rapid TOPOLOGY: server - func: run lambda handler example tests - - name: test-deployed-lambda - tags: - - latest - - lambda - commands: - - func: install dependencies - - func: run deployed aws lambda tests - name: test-lambda-aws-auth-example tags: - latest @@ -3471,6 +3466,38 @@ task_groups: setup_group_timeout_secs: 1800 tasks: - oidc-auth-test-azure-latest + - name: test_aws_lambda_task_group + setup_group: + - func: fetch source + - command: subprocess.exec + params: + working_dir: src + binary: bash + args: + - ${DRIVERS_TOOLS}/aws_lambda/teardown-atlas-cluster.sh + env: + DRIVERS_TOOLS: ${DRIVERS_TOOLS} + DRIVERS_ATLAS_PUBLIC_API_KEY: ${DRIVERS_ATLAS_PUBLIC_API_KEY} + DRIVERS_ATLAS_PRIVATE_API_KEY: ${DRIVERS_ATLAS_PRIVATE_API_KEY} + DRIVERS_ATLAS_GROUP_ID: ${DRIVERS_ATLAS_GROUP_ID} + LAMBDA_STACK_NAME: dbx-node-lambda + teardown_group: + - command: subprocess.exec + params: + working_dir: src + binary: bash + args: + - ${DRIVERS_TOOLS}/aws_lambda/teardown-atlas-cluster.sh + env: + DRIVERS_TOOLS: ${DRIVERS_TOOLS} + DRIVERS_ATLAS_PUBLIC_API_KEY: ${DRIVERS_ATLAS_PUBLIC_API_KEY} + DRIVERS_ATLAS_PRIVATE_API_KEY: ${DRIVERS_ATLAS_PRIVATE_API_KEY} + DRIVERS_ATLAS_GROUP_ID: ${DRIVERS_ATLAS_GROUP_ID} + LAMBDA_STACK_NAME: dbx-node-lambda + setup_group_can_fail_task: true + setup_group_timeout_secs: 1800 + tasks: + - test-aws-lambda-deployed pre: - func: fetch source - func: windows fix @@ -4055,6 +4082,12 @@ buildvariants: batchtime: 20160 tasks: - testazureoidc_task_group + - name: rhel8-test-aws-lambda + display_name: AWS Lambda Deployed Tests + run_on: rhel80-large + batchtime: 20160 + tasks: + - test_aws_lambda_task_group - name: rhel8-no-auth-tests display_name: No Auth Tests run_on: rhel80-large @@ -4094,7 +4127,6 @@ buildvariants: tasks: - test-lambda-example - test-lambda-aws-auth-example - - test-deployed-lambda - name: rhel8-test-seach-index-management-helpers display_name: Search Index Management Helpers Tests run_on: rhel80-large diff --git a/.evergreen/generate_evergreen_tasks.js b/.evergreen/generate_evergreen_tasks.js index 74b3f98148..f0e84d7174 100644 --- a/.evergreen/generate_evergreen_tasks.js +++ b/.evergreen/generate_evergreen_tasks.js @@ -302,16 +302,6 @@ AWS_LAMBDA_HANDLER_TASKS.push({ ] }); -// Add the deployed lambda function tests. -AWS_LAMBDA_HANDLER_TASKS.push({ - name: 'test-deployed-lambda', - tags: ['latest', 'lambda'], - commands: [ - { func: 'install dependencies' }, - { func: 'run deployed aws lambda tests' } - ] -}); - // Add task for testing lambda example with aws auth. AWS_LAMBDA_HANDLER_TASKS.push({ name: 'test-lambda-aws-auth-example', @@ -763,6 +753,14 @@ BUILD_VARIANTS.push({ tasks: ['testazureoidc_task_group'] }); +BUILD_VARIANTS.push({ + name: 'rhel8-test-aws-lambda', + display_name: 'AWS Lambda Deployed Tests', + run_on: DEFAULT_OS, + batchtime: 20160, + tasks: ['test_aws_lambda_task_group'] +}); + BUILD_VARIANTS.push({ name: 'rhel8-no-auth-tests', display_name: 'No Auth Tests', @@ -777,7 +775,7 @@ BUILD_VARIANTS.push({ name: 'rhel8-test-lambda', display_name: 'AWS Lambda handler tests', run_on: DEFAULT_OS, - tasks: ['test-lambda-example', 'test-lambda-aws-auth-example', 'test-deployed-lambda'] + tasks: ['test-lambda-example', 'test-lambda-aws-auth-example'] }); BUILD_VARIANTS.push({ From af2acbd7323eebc7d2e161d316c1605a3fdfaa8c Mon Sep 17 00:00:00 2001 From: Durran Jordan Date: Thu, 22 Jun 2023 18:28:09 +0200 Subject: [PATCH 02/11] test: point to tools branch --- .evergreen/prepare-shell.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.evergreen/prepare-shell.sh b/.evergreen/prepare-shell.sh index f3f8ffad19..9c437278af 100644 --- a/.evergreen/prepare-shell.sh +++ b/.evergreen/prepare-shell.sh @@ -31,7 +31,7 @@ export PATH="$MONGODB_BINARIES:$PATH" if [ ! -d "$DRIVERS_TOOLS" ]; then # Only clone driver tools if it does not exist - git clone --depth=1 "https://github.com/mongodb-labs/drivers-evergreen-tools.git" "${DRIVERS_TOOLS}" + git clone --depth=1 --branch NODE-5361 "https://github.com/mongodb-labs/drivers-evergreen-tools.git" "${DRIVERS_TOOLS}" fi echo "installed DRIVERS_EVERGREEN_TOOLS from commit $(git -C $DRIVERS_EVERGREEN_TOOLS rev-parse HEAD)" From 58a02fc014b7474e684b32c3e9e4e2556da81ba4 Mon Sep 17 00:00:00 2001 From: Durran Jordan Date: Thu, 22 Jun 2023 18:34:57 +0200 Subject: [PATCH 03/11] test: fix branch --- .evergreen/prepare-shell.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.evergreen/prepare-shell.sh b/.evergreen/prepare-shell.sh index 9c437278af..b54feb7bd9 100644 --- a/.evergreen/prepare-shell.sh +++ b/.evergreen/prepare-shell.sh @@ -31,7 +31,7 @@ export PATH="$MONGODB_BINARIES:$PATH" if [ ! -d "$DRIVERS_TOOLS" ]; then # Only clone driver tools if it does not exist - git clone --depth=1 --branch NODE-5361 "https://github.com/mongodb-labs/drivers-evergreen-tools.git" "${DRIVERS_TOOLS}" + git clone --depth=1 --branch DRIVERS-2657 "https://github.com/mongodb-labs/drivers-evergreen-tools.git" "${DRIVERS_TOOLS}" fi echo "installed DRIVERS_EVERGREEN_TOOLS from commit $(git -C $DRIVERS_EVERGREEN_TOOLS rev-parse HEAD)" From 2af48e592311e14037bb7b8a73550a16753b862d Mon Sep 17 00:00:00 2001 From: Durran Jordan Date: Thu, 22 Jun 2023 21:05:10 +0200 Subject: [PATCH 04/11] test: fix script location --- .evergreen/config.in.yml | 4 ++-- .evergreen/config.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.evergreen/config.in.yml b/.evergreen/config.in.yml index 34a5f5f958..943d18bb3d 100644 --- a/.evergreen/config.in.yml +++ b/.evergreen/config.in.yml @@ -1421,7 +1421,7 @@ task_groups: working_dir: src binary: bash args: - - ${DRIVERS_TOOLS}/aws_lambda/teardown-atlas-cluster.sh + - ${DRIVERS_TOOLS}/.evergreen/aws_lambda/setup-atlas-cluster.sh env: DRIVERS_TOOLS: ${DRIVERS_TOOLS} DRIVERS_ATLAS_PUBLIC_API_KEY: ${DRIVERS_ATLAS_PUBLIC_API_KEY} @@ -1434,7 +1434,7 @@ task_groups: working_dir: src binary: bash args: - - ${DRIVERS_TOOLS}/aws_lambda/teardown-atlas-cluster.sh + - ${DRIVERS_TOOLS}/.evergreen/aws_lambda/teardown-atlas-cluster.sh env: DRIVERS_TOOLS: ${DRIVERS_TOOLS} DRIVERS_ATLAS_PUBLIC_API_KEY: ${DRIVERS_ATLAS_PUBLIC_API_KEY} diff --git a/.evergreen/config.yml b/.evergreen/config.yml index b7f905ea28..9915f42df7 100644 --- a/.evergreen/config.yml +++ b/.evergreen/config.yml @@ -3474,7 +3474,7 @@ task_groups: working_dir: src binary: bash args: - - ${DRIVERS_TOOLS}/aws_lambda/teardown-atlas-cluster.sh + - ${DRIVERS_TOOLS}/.evergreen/aws_lambda/setup-atlas-cluster.sh env: DRIVERS_TOOLS: ${DRIVERS_TOOLS} DRIVERS_ATLAS_PUBLIC_API_KEY: ${DRIVERS_ATLAS_PUBLIC_API_KEY} @@ -3487,7 +3487,7 @@ task_groups: working_dir: src binary: bash args: - - ${DRIVERS_TOOLS}/aws_lambda/teardown-atlas-cluster.sh + - ${DRIVERS_TOOLS}/.evergreen/aws_lambda/teardown-atlas-cluster.sh env: DRIVERS_TOOLS: ${DRIVERS_TOOLS} DRIVERS_ATLAS_PUBLIC_API_KEY: ${DRIVERS_ATLAS_PUBLIC_API_KEY} From 9a4d527f1e80bc80b4c769fdbe5a7b47b0fdedd9 Mon Sep 17 00:00:00 2001 From: Durran Jordan Date: Thu, 22 Jun 2023 21:36:03 +0200 Subject: [PATCH 05/11] test: fix main script link --- .evergreen/config.in.yml | 2 +- .evergreen/config.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.evergreen/config.in.yml b/.evergreen/config.in.yml index 943d18bb3d..542aa393fc 100644 --- a/.evergreen/config.in.yml +++ b/.evergreen/config.in.yml @@ -1267,7 +1267,7 @@ tasks: working_dir: src binary: bash args: - - ${DRIVERS_TOOLS}/aws_lambda/run-deployed-lambda-aws-tests.sh + - ${DRIVERS_TOOLS}/.evergreen/aws_lambda/run-deployed-lambda-aws-tests.sh env: TEST_LAMBDA_DIRECTORY: ${PROJECT_DIRECTORY}/test/lambda DRIVERS_TOOLS: ${DRIVERS_TOOLS} diff --git a/.evergreen/config.yml b/.evergreen/config.yml index 9915f42df7..5367b28e25 100644 --- a/.evergreen/config.yml +++ b/.evergreen/config.yml @@ -1191,7 +1191,7 @@ tasks: working_dir: src binary: bash args: - - ${DRIVERS_TOOLS}/aws_lambda/run-deployed-lambda-aws-tests.sh + - ${DRIVERS_TOOLS}/.evergreen/aws_lambda/run-deployed-lambda-aws-tests.sh env: TEST_LAMBDA_DIRECTORY: ${PROJECT_DIRECTORY}/test/lambda DRIVERS_TOOLS: ${DRIVERS_TOOLS} From 00463e315c9d1ed0352ec9e9c8bff1d49731331b Mon Sep 17 00:00:00 2001 From: Durran Jordan Date: Thu, 22 Jun 2023 22:41:27 +0200 Subject: [PATCH 06/11] test: use uri expansion --- .evergreen/config.in.yml | 8 ++++++-- .evergreen/config.yml | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.evergreen/config.in.yml b/.evergreen/config.in.yml index 542aa393fc..6f23b0252d 100644 --- a/.evergreen/config.in.yml +++ b/.evergreen/config.in.yml @@ -1269,12 +1269,11 @@ tasks: args: - ${DRIVERS_TOOLS}/.evergreen/aws_lambda/run-deployed-lambda-aws-tests.sh env: + MONGODB_URI: ${MONGODB_URI} TEST_LAMBDA_DIRECTORY: ${PROJECT_DIRECTORY}/test/lambda DRIVERS_TOOLS: ${DRIVERS_TOOLS} DRIVERS_ATLAS_PUBLIC_API_KEY: ${DRIVERS_ATLAS_PUBLIC_API_KEY} DRIVERS_ATLAS_PRIVATE_API_KEY: ${DRIVERS_ATLAS_PRIVATE_API_KEY} - DRIVERS_ATLAS_LAMBDA_USER: ${DRIVERS_ATLAS_LAMBDA_USER} - DRIVERS_ATLAS_LAMBDA_PASSWORD: ${DRIVERS_ATLAS_LAMBDA_PASSWORD} DRIVERS_ATLAS_GROUP_ID: ${DRIVERS_ATLAS_GROUP_ID} LAMBDA_STACK_NAME: dbx-node-lambda AWS_REGION: us-east-1 @@ -1427,7 +1426,12 @@ task_groups: DRIVERS_ATLAS_PUBLIC_API_KEY: ${DRIVERS_ATLAS_PUBLIC_API_KEY} DRIVERS_ATLAS_PRIVATE_API_KEY: ${DRIVERS_ATLAS_PRIVATE_API_KEY} DRIVERS_ATLAS_GROUP_ID: ${DRIVERS_ATLAS_GROUP_ID} + DRIVERS_ATLAS_LAMBDA_USER: ${DRIVERS_ATLAS_LAMBDA_USER} + DRIVERS_ATLAS_LAMBDA_PASSWORD: ${DRIVERS_ATLAS_LAMBDA_PASSWORD} LAMBDA_STACK_NAME: dbx-node-lambda + - command: expansions.update + params: + file: atlas-expansion.yml teardown_group: - command: subprocess.exec params: diff --git a/.evergreen/config.yml b/.evergreen/config.yml index 5367b28e25..b38fd870f1 100644 --- a/.evergreen/config.yml +++ b/.evergreen/config.yml @@ -1193,12 +1193,11 @@ tasks: args: - ${DRIVERS_TOOLS}/.evergreen/aws_lambda/run-deployed-lambda-aws-tests.sh env: + MONGODB_URI: ${MONGODB_URI} TEST_LAMBDA_DIRECTORY: ${PROJECT_DIRECTORY}/test/lambda DRIVERS_TOOLS: ${DRIVERS_TOOLS} DRIVERS_ATLAS_PUBLIC_API_KEY: ${DRIVERS_ATLAS_PUBLIC_API_KEY} DRIVERS_ATLAS_PRIVATE_API_KEY: ${DRIVERS_ATLAS_PRIVATE_API_KEY} - DRIVERS_ATLAS_LAMBDA_USER: ${DRIVERS_ATLAS_LAMBDA_USER} - DRIVERS_ATLAS_LAMBDA_PASSWORD: ${DRIVERS_ATLAS_LAMBDA_PASSWORD} DRIVERS_ATLAS_GROUP_ID: ${DRIVERS_ATLAS_GROUP_ID} LAMBDA_STACK_NAME: dbx-node-lambda AWS_REGION: us-east-1 @@ -3480,7 +3479,12 @@ task_groups: DRIVERS_ATLAS_PUBLIC_API_KEY: ${DRIVERS_ATLAS_PUBLIC_API_KEY} DRIVERS_ATLAS_PRIVATE_API_KEY: ${DRIVERS_ATLAS_PRIVATE_API_KEY} DRIVERS_ATLAS_GROUP_ID: ${DRIVERS_ATLAS_GROUP_ID} + DRIVERS_ATLAS_LAMBDA_USER: ${DRIVERS_ATLAS_LAMBDA_USER} + DRIVERS_ATLAS_LAMBDA_PASSWORD: ${DRIVERS_ATLAS_LAMBDA_PASSWORD} LAMBDA_STACK_NAME: dbx-node-lambda + - command: expansions.update + params: + file: atlas-expansion.yml teardown_group: - command: subprocess.exec params: From 27ebfe78ad6b3e3fbe37e514341ba65b12c5ca54 Mon Sep 17 00:00:00 2001 From: Durran Jordan Date: Thu, 22 Jun 2023 23:11:14 +0200 Subject: [PATCH 07/11] test: change expansion location --- .evergreen/config.in.yml | 2 +- .evergreen/config.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.evergreen/config.in.yml b/.evergreen/config.in.yml index 6f23b0252d..c72f96bba2 100644 --- a/.evergreen/config.in.yml +++ b/.evergreen/config.in.yml @@ -1431,7 +1431,7 @@ task_groups: LAMBDA_STACK_NAME: dbx-node-lambda - command: expansions.update params: - file: atlas-expansion.yml + file: src/atlas-expansion.yml teardown_group: - command: subprocess.exec params: diff --git a/.evergreen/config.yml b/.evergreen/config.yml index b38fd870f1..abe75fcd9e 100644 --- a/.evergreen/config.yml +++ b/.evergreen/config.yml @@ -3484,7 +3484,7 @@ task_groups: LAMBDA_STACK_NAME: dbx-node-lambda - command: expansions.update params: - file: atlas-expansion.yml + file: src/atlas-expansion.yml teardown_group: - command: subprocess.exec params: From 65d4deda0c512f7f5e741a3ccd62121e87a16722 Mon Sep 17 00:00:00 2001 From: Durran Jordan Date: Mon, 26 Jun 2023 22:09:09 +0200 Subject: [PATCH 08/11] test: use more expansions --- .evergreen/config.in.yml | 26 +++----------------------- .evergreen/config.yml | 26 +++----------------------- 2 files changed, 6 insertions(+), 46 deletions(-) diff --git a/.evergreen/config.in.yml b/.evergreen/config.in.yml index c72f96bba2..aff8dec166 100644 --- a/.evergreen/config.in.yml +++ b/.evergreen/config.in.yml @@ -1266,20 +1266,12 @@ tasks: params: working_dir: src binary: bash + add_expansions_to_env: true args: - ${DRIVERS_TOOLS}/.evergreen/aws_lambda/run-deployed-lambda-aws-tests.sh env: - MONGODB_URI: ${MONGODB_URI} TEST_LAMBDA_DIRECTORY: ${PROJECT_DIRECTORY}/test/lambda - DRIVERS_TOOLS: ${DRIVERS_TOOLS} - DRIVERS_ATLAS_PUBLIC_API_KEY: ${DRIVERS_ATLAS_PUBLIC_API_KEY} - DRIVERS_ATLAS_PRIVATE_API_KEY: ${DRIVERS_ATLAS_PRIVATE_API_KEY} - DRIVERS_ATLAS_GROUP_ID: ${DRIVERS_ATLAS_GROUP_ID} - LAMBDA_STACK_NAME: dbx-node-lambda AWS_REGION: us-east-1 - AWS_ACCESS_KEY_ID: ${AWS_ACCESS_KEY_ID} - AWS_SECRET_ACCESS_KEY: ${AWS_SECRET_ACCESS_KEY} - AWS_SESSION_TOKEN: ${AWS_SESSION_TOKEN} task_groups: - name: serverless_task_group @@ -1419,16 +1411,9 @@ task_groups: params: working_dir: src binary: bash + add_expansions_to_env: true args: - ${DRIVERS_TOOLS}/.evergreen/aws_lambda/setup-atlas-cluster.sh - env: - DRIVERS_TOOLS: ${DRIVERS_TOOLS} - DRIVERS_ATLAS_PUBLIC_API_KEY: ${DRIVERS_ATLAS_PUBLIC_API_KEY} - DRIVERS_ATLAS_PRIVATE_API_KEY: ${DRIVERS_ATLAS_PRIVATE_API_KEY} - DRIVERS_ATLAS_GROUP_ID: ${DRIVERS_ATLAS_GROUP_ID} - DRIVERS_ATLAS_LAMBDA_USER: ${DRIVERS_ATLAS_LAMBDA_USER} - DRIVERS_ATLAS_LAMBDA_PASSWORD: ${DRIVERS_ATLAS_LAMBDA_PASSWORD} - LAMBDA_STACK_NAME: dbx-node-lambda - command: expansions.update params: file: src/atlas-expansion.yml @@ -1437,14 +1422,9 @@ task_groups: params: working_dir: src binary: bash + add_expansions_to_env: true args: - ${DRIVERS_TOOLS}/.evergreen/aws_lambda/teardown-atlas-cluster.sh - env: - DRIVERS_TOOLS: ${DRIVERS_TOOLS} - DRIVERS_ATLAS_PUBLIC_API_KEY: ${DRIVERS_ATLAS_PUBLIC_API_KEY} - DRIVERS_ATLAS_PRIVATE_API_KEY: ${DRIVERS_ATLAS_PRIVATE_API_KEY} - DRIVERS_ATLAS_GROUP_ID: ${DRIVERS_ATLAS_GROUP_ID} - LAMBDA_STACK_NAME: dbx-node-lambda setup_group_can_fail_task: true setup_group_timeout_secs: 1800 tasks: diff --git a/.evergreen/config.yml b/.evergreen/config.yml index abe75fcd9e..6d0d321b28 100644 --- a/.evergreen/config.yml +++ b/.evergreen/config.yml @@ -1190,20 +1190,12 @@ tasks: params: working_dir: src binary: bash + add_expansions_to_env: true args: - ${DRIVERS_TOOLS}/.evergreen/aws_lambda/run-deployed-lambda-aws-tests.sh env: - MONGODB_URI: ${MONGODB_URI} TEST_LAMBDA_DIRECTORY: ${PROJECT_DIRECTORY}/test/lambda - DRIVERS_TOOLS: ${DRIVERS_TOOLS} - DRIVERS_ATLAS_PUBLIC_API_KEY: ${DRIVERS_ATLAS_PUBLIC_API_KEY} - DRIVERS_ATLAS_PRIVATE_API_KEY: ${DRIVERS_ATLAS_PRIVATE_API_KEY} - DRIVERS_ATLAS_GROUP_ID: ${DRIVERS_ATLAS_GROUP_ID} - LAMBDA_STACK_NAME: dbx-node-lambda AWS_REGION: us-east-1 - AWS_ACCESS_KEY_ID: ${AWS_ACCESS_KEY_ID} - AWS_SECRET_ACCESS_KEY: ${AWS_SECRET_ACCESS_KEY} - AWS_SESSION_TOKEN: ${AWS_SESSION_TOKEN} - name: test-latest-server tags: - latest @@ -3472,16 +3464,9 @@ task_groups: params: working_dir: src binary: bash + add_expansions_to_env: true args: - ${DRIVERS_TOOLS}/.evergreen/aws_lambda/setup-atlas-cluster.sh - env: - DRIVERS_TOOLS: ${DRIVERS_TOOLS} - DRIVERS_ATLAS_PUBLIC_API_KEY: ${DRIVERS_ATLAS_PUBLIC_API_KEY} - DRIVERS_ATLAS_PRIVATE_API_KEY: ${DRIVERS_ATLAS_PRIVATE_API_KEY} - DRIVERS_ATLAS_GROUP_ID: ${DRIVERS_ATLAS_GROUP_ID} - DRIVERS_ATLAS_LAMBDA_USER: ${DRIVERS_ATLAS_LAMBDA_USER} - DRIVERS_ATLAS_LAMBDA_PASSWORD: ${DRIVERS_ATLAS_LAMBDA_PASSWORD} - LAMBDA_STACK_NAME: dbx-node-lambda - command: expansions.update params: file: src/atlas-expansion.yml @@ -3490,14 +3475,9 @@ task_groups: params: working_dir: src binary: bash + add_expansions_to_env: true args: - ${DRIVERS_TOOLS}/.evergreen/aws_lambda/teardown-atlas-cluster.sh - env: - DRIVERS_TOOLS: ${DRIVERS_TOOLS} - DRIVERS_ATLAS_PUBLIC_API_KEY: ${DRIVERS_ATLAS_PUBLIC_API_KEY} - DRIVERS_ATLAS_PRIVATE_API_KEY: ${DRIVERS_ATLAS_PRIVATE_API_KEY} - DRIVERS_ATLAS_GROUP_ID: ${DRIVERS_ATLAS_GROUP_ID} - LAMBDA_STACK_NAME: dbx-node-lambda setup_group_can_fail_task: true setup_group_timeout_secs: 1800 tasks: From d1e207fd3894b030ff8d62eec4485fc90dc066e1 Mon Sep 17 00:00:00 2001 From: Durran Jordan Date: Tue, 27 Jun 2023 16:45:16 +0200 Subject: [PATCH 09/11] test: rename task group --- .evergreen/config.in.yml | 6 +++--- .evergreen/config.yml | 12 ++++++------ .evergreen/generate_evergreen_tasks.js | 6 +++--- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.evergreen/config.in.yml b/.evergreen/config.in.yml index aff8dec166..f1b94201d7 100644 --- a/.evergreen/config.in.yml +++ b/.evergreen/config.in.yml @@ -1404,7 +1404,7 @@ task_groups: tasks: - oidc-auth-test-azure-latest - - name: test_aws_lambda_task_group + - name: test_atlas_task_group setup_group: - func: fetch source - command: subprocess.exec @@ -1413,7 +1413,7 @@ task_groups: binary: bash add_expansions_to_env: true args: - - ${DRIVERS_TOOLS}/.evergreen/aws_lambda/setup-atlas-cluster.sh + - ${DRIVERS_TOOLS}/.evergreen/atlas/setup-atlas-cluster.sh - command: expansions.update params: file: src/atlas-expansion.yml @@ -1424,7 +1424,7 @@ task_groups: binary: bash add_expansions_to_env: true args: - - ${DRIVERS_TOOLS}/.evergreen/aws_lambda/teardown-atlas-cluster.sh + - ${DRIVERS_TOOLS}/.evergreen/atlas/teardown-atlas-cluster.sh setup_group_can_fail_task: true setup_group_timeout_secs: 1800 tasks: diff --git a/.evergreen/config.yml b/.evergreen/config.yml index 6d0d321b28..5948d9af62 100644 --- a/.evergreen/config.yml +++ b/.evergreen/config.yml @@ -3457,7 +3457,7 @@ task_groups: setup_group_timeout_secs: 1800 tasks: - oidc-auth-test-azure-latest - - name: test_aws_lambda_task_group + - name: test_atlas_task_group setup_group: - func: fetch source - command: subprocess.exec @@ -3466,7 +3466,7 @@ task_groups: binary: bash add_expansions_to_env: true args: - - ${DRIVERS_TOOLS}/.evergreen/aws_lambda/setup-atlas-cluster.sh + - ${DRIVERS_TOOLS}/.evergreen/atlas/setup-atlas-cluster.sh - command: expansions.update params: file: src/atlas-expansion.yml @@ -3477,7 +3477,7 @@ task_groups: binary: bash add_expansions_to_env: true args: - - ${DRIVERS_TOOLS}/.evergreen/aws_lambda/teardown-atlas-cluster.sh + - ${DRIVERS_TOOLS}/.evergreen/atlas/teardown-atlas-cluster.sh setup_group_can_fail_task: true setup_group_timeout_secs: 1800 tasks: @@ -4066,12 +4066,12 @@ buildvariants: batchtime: 20160 tasks: - testazureoidc_task_group - - name: rhel8-test-aws-lambda - display_name: AWS Lambda Deployed Tests + - name: rhel8-test-atlas + display_name: Atlas Cluster Tests run_on: rhel80-large batchtime: 20160 tasks: - - test_aws_lambda_task_group + - test_atlas_task_group - name: rhel8-no-auth-tests display_name: No Auth Tests run_on: rhel80-large diff --git a/.evergreen/generate_evergreen_tasks.js b/.evergreen/generate_evergreen_tasks.js index f0e84d7174..bfb48411a3 100644 --- a/.evergreen/generate_evergreen_tasks.js +++ b/.evergreen/generate_evergreen_tasks.js @@ -754,11 +754,11 @@ BUILD_VARIANTS.push({ }); BUILD_VARIANTS.push({ - name: 'rhel8-test-aws-lambda', - display_name: 'AWS Lambda Deployed Tests', + name: 'rhel8-test-atlas', + display_name: 'Atlas Cluster Tests', run_on: DEFAULT_OS, batchtime: 20160, - tasks: ['test_aws_lambda_task_group'] + tasks: ['test_atlas_task_group'] }); BUILD_VARIANTS.push({ From f2d9ce7ff42659460f16fc0b816e228d04bf983b Mon Sep 17 00:00:00 2001 From: Durran Jordan Date: Wed, 28 Jun 2023 15:43:57 +0200 Subject: [PATCH 10/11] test: use tools master --- .evergreen/prepare-shell.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.evergreen/prepare-shell.sh b/.evergreen/prepare-shell.sh index b54feb7bd9..f3f8ffad19 100644 --- a/.evergreen/prepare-shell.sh +++ b/.evergreen/prepare-shell.sh @@ -31,7 +31,7 @@ export PATH="$MONGODB_BINARIES:$PATH" if [ ! -d "$DRIVERS_TOOLS" ]; then # Only clone driver tools if it does not exist - git clone --depth=1 --branch DRIVERS-2657 "https://github.com/mongodb-labs/drivers-evergreen-tools.git" "${DRIVERS_TOOLS}" + git clone --depth=1 "https://github.com/mongodb-labs/drivers-evergreen-tools.git" "${DRIVERS_TOOLS}" fi echo "installed DRIVERS_EVERGREEN_TOOLS from commit $(git -C $DRIVERS_EVERGREEN_TOOLS rev-parse HEAD)" From ee8309bede0d60e2fc2d45a3bab7dbec411632c1 Mon Sep 17 00:00:00 2001 From: Durran Jordan Date: Wed, 28 Jun 2023 21:36:54 +0200 Subject: [PATCH 11/11] test: remove batch time --- .evergreen/config.yml | 1 - .evergreen/generate_evergreen_tasks.js | 1 - 2 files changed, 2 deletions(-) diff --git a/.evergreen/config.yml b/.evergreen/config.yml index 5948d9af62..0578f31739 100644 --- a/.evergreen/config.yml +++ b/.evergreen/config.yml @@ -4069,7 +4069,6 @@ buildvariants: - name: rhel8-test-atlas display_name: Atlas Cluster Tests run_on: rhel80-large - batchtime: 20160 tasks: - test_atlas_task_group - name: rhel8-no-auth-tests diff --git a/.evergreen/generate_evergreen_tasks.js b/.evergreen/generate_evergreen_tasks.js index bfb48411a3..7772d3fcd6 100644 --- a/.evergreen/generate_evergreen_tasks.js +++ b/.evergreen/generate_evergreen_tasks.js @@ -757,7 +757,6 @@ BUILD_VARIANTS.push({ name: 'rhel8-test-atlas', display_name: 'Atlas Cluster Tests', run_on: DEFAULT_OS, - batchtime: 20160, tasks: ['test_atlas_task_group'] });