From dc068ac1f6e91794836e103f8a06c2580405ad76 Mon Sep 17 00:00:00 2001 From: Bailey Pearson Date: Wed, 14 Jun 2023 12:33:39 -0600 Subject: [PATCH] ci(NODE-5322): fix lambda handler aws test (#3725) --- .evergreen/config.in.yml | 8 ++++++-- .evergreen/config.yml | 6 +++++- .evergreen/prepare-shell.sh | 2 ++ 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/.evergreen/config.in.yml b/.evergreen/config.in.yml index faa5fd4aee..b6cbe69472 100644 --- a/.evergreen/config.in.yml +++ b/.evergreen/config.in.yml @@ -1042,15 +1042,19 @@ functions: - command: shell.exec type: test params: - working_dir: "src" + working_dir: src silent: true + shell: bash script: | + set -ex cd ${DRIVERS_TOOLS}/.evergreen/auth_aws - ${MONGODB_BINARIES}/mongo --verbose aws_e2e_regular_aws.js + . ./activate-authawsvenv.sh + python aws_tester.py regular cd - cat < "${PROJECT_DIRECTORY}/prepare_mongodb_aws.sh" export AWS_ACCESS_KEY_ID=${iam_auth_ecs_account} export AWS_SECRET_ACCESS_KEY=${iam_auth_ecs_secret_access_key} + export MONGODB_URI="mongodb://localhost:27017/aws?authMechanism=MONGODB-AWS" EOF - command: shell.exec type: test diff --git a/.evergreen/config.yml b/.evergreen/config.yml index 9b53d69fe2..90809f8e67 100644 --- a/.evergreen/config.yml +++ b/.evergreen/config.yml @@ -988,13 +988,17 @@ functions: params: working_dir: src silent: true + shell: bash script: | + set -ex cd ${DRIVERS_TOOLS}/.evergreen/auth_aws - ${MONGODB_BINARIES}/mongo --verbose aws_e2e_regular_aws.js + . ./activate-authawsvenv.sh + python aws_tester.py regular cd - cat < "${PROJECT_DIRECTORY}/prepare_mongodb_aws.sh" export AWS_ACCESS_KEY_ID=${iam_auth_ecs_account} export AWS_SECRET_ACCESS_KEY=${iam_auth_ecs_secret_access_key} + export MONGODB_URI="mongodb://localhost:27017/aws?authMechanism=MONGODB-AWS" EOF - command: shell.exec type: test diff --git a/.evergreen/prepare-shell.sh b/.evergreen/prepare-shell.sh index 4e2cfb0eaf..f3f8ffad19 100644 --- a/.evergreen/prepare-shell.sh +++ b/.evergreen/prepare-shell.sh @@ -34,6 +34,8 @@ if [ ! -d "$DRIVERS_TOOLS" ]; then 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)" + cat < "$MONGO_ORCHESTRATION_HOME/orchestration.config" { "releases": {