From f8963a33ec34296cf92cbb7384874d12d38b7cd3 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Tue, 18 Feb 2025 06:12:34 -0600 Subject: [PATCH 1/9] test aws-output-file --- .evergreen/scripts/configure-env.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.evergreen/scripts/configure-env.sh b/.evergreen/scripts/configure-env.sh index 16212ad3b1..f78fca9f46 100755 --- a/.evergreen/scripts/configure-env.sh +++ b/.evergreen/scripts/configure-env.sh @@ -89,7 +89,7 @@ EOT # Write the .env file for drivers-tools. rm -rf $DRIVERS_TOOLS -git clone https://github.com/mongodb-labs/drivers-evergreen-tools.git $DRIVERS_TOOLS +git clone --branch aws-output-file https://github.com/blink1073/drivers-evergreen-tools.git $DRIVERS_TOOLS cat < ${DRIVERS_TOOLS}/.env SKIP_LEGACY_SHELL=1 From 363abba345168b17584335c3b80bba829013634a Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Tue, 18 Feb 2025 06:20:39 -0600 Subject: [PATCH 2/9] debug --- .evergreen/scripts/run-mongodb-aws-test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.evergreen/scripts/run-mongodb-aws-test.sh b/.evergreen/scripts/run-mongodb-aws-test.sh index 255f84f295..0511bef729 100755 --- a/.evergreen/scripts/run-mongodb-aws-test.sh +++ b/.evergreen/scripts/run-mongodb-aws-test.sh @@ -23,6 +23,6 @@ echo "Running MONGODB-AWS authentication tests for $1" # Handle credentials and environment setup. . "$DRIVERS_TOOLS"/.evergreen/auth_aws/aws_setup.sh "$1" - +pwd TEST_AUTH_AWS=1 AUTH="auth" bash ./.evergreen/just.sh setup-test bash ./.evergreen/just.sh test-eg From 0aa50872f124388154e4482cef285c0e3e45e3ff Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Tue, 18 Feb 2025 06:21:04 -0600 Subject: [PATCH 3/9] debug --- .evergreen/scripts/run-mongodb-aws-test.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/.evergreen/scripts/run-mongodb-aws-test.sh b/.evergreen/scripts/run-mongodb-aws-test.sh index 0511bef729..dc655a262f 100755 --- a/.evergreen/scripts/run-mongodb-aws-test.sh +++ b/.evergreen/scripts/run-mongodb-aws-test.sh @@ -24,5 +24,6 @@ echo "Running MONGODB-AWS authentication tests for $1" # Handle credentials and environment setup. . "$DRIVERS_TOOLS"/.evergreen/auth_aws/aws_setup.sh "$1" pwd +ls -a TEST_AUTH_AWS=1 AUTH="auth" bash ./.evergreen/just.sh setup-test bash ./.evergreen/just.sh test-eg From 734a8dc5d2d6933ac519021772ea423a1149ab0c Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Tue, 18 Feb 2025 10:14:31 -0600 Subject: [PATCH 4/9] undo debug --- .evergreen/scripts/run-mongodb-aws-test.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/.evergreen/scripts/run-mongodb-aws-test.sh b/.evergreen/scripts/run-mongodb-aws-test.sh index dc655a262f..43c1a455e1 100755 --- a/.evergreen/scripts/run-mongodb-aws-test.sh +++ b/.evergreen/scripts/run-mongodb-aws-test.sh @@ -23,7 +23,5 @@ echo "Running MONGODB-AWS authentication tests for $1" # Handle credentials and environment setup. . "$DRIVERS_TOOLS"/.evergreen/auth_aws/aws_setup.sh "$1" -pwd -ls -a TEST_AUTH_AWS=1 AUTH="auth" bash ./.evergreen/just.sh setup-test bash ./.evergreen/just.sh test-eg From 6e76bd093c08286f2433c6459db7ad2d80487ecc Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Tue, 18 Feb 2025 10:45:20 -0600 Subject: [PATCH 5/9] do not run again for ecs --- .evergreen/scripts/run-mongodb-aws-test.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.evergreen/scripts/run-mongodb-aws-test.sh b/.evergreen/scripts/run-mongodb-aws-test.sh index 43c1a455e1..0e88c331c1 100755 --- a/.evergreen/scripts/run-mongodb-aws-test.sh +++ b/.evergreen/scripts/run-mongodb-aws-test.sh @@ -23,5 +23,8 @@ echo "Running MONGODB-AWS authentication tests for $1" # Handle credentials and environment setup. . "$DRIVERS_TOOLS"/.evergreen/auth_aws/aws_setup.sh "$1" -TEST_AUTH_AWS=1 AUTH="auth" bash ./.evergreen/just.sh setup-test -bash ./.evergreen/just.sh test-eg + +if [ "$1" != "ecs" ]; then + TEST_AUTH_AWS=1 AUTH="auth" bash ./.evergreen/just.sh setup-test + bash ./.evergreen/just.sh test-eg +fi From a3793f238fd1e72b18d3be474104c9caabf9ac8e Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Wed, 19 Feb 2025 19:27:09 -0600 Subject: [PATCH 6/9] more debug --- .evergreen/run-mongodb-aws-ecs-test.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.evergreen/run-mongodb-aws-ecs-test.sh b/.evergreen/run-mongodb-aws-ecs-test.sh index 96d3c0611e..ac3c18d7c1 100755 --- a/.evergreen/run-mongodb-aws-ecs-test.sh +++ b/.evergreen/run-mongodb-aws-ecs-test.sh @@ -31,5 +31,7 @@ export AUTH="auth" export SET_XTRACE_ON=1 cd src rm -rf .venv +env bash ./.evergreen/just.sh setup-test +cat .evergreen/scripts/test-env.sh bash .evergreen/just.sh test-eg From 04acc4b1e51327c63ebf6a5190cd6166c40c9b64 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Wed, 19 Feb 2025 19:40:22 -0600 Subject: [PATCH 7/9] remove env file --- .evergreen/run-mongodb-aws-ecs-test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.evergreen/run-mongodb-aws-ecs-test.sh b/.evergreen/run-mongodb-aws-ecs-test.sh index ac3c18d7c1..b8e618a87a 100755 --- a/.evergreen/run-mongodb-aws-ecs-test.sh +++ b/.evergreen/run-mongodb-aws-ecs-test.sh @@ -31,7 +31,7 @@ export AUTH="auth" export SET_XTRACE_ON=1 cd src rm -rf .venv -env +rm -f .evergreen/scripts/test-env.sh || true bash ./.evergreen/just.sh setup-test cat .evergreen/scripts/test-env.sh bash .evergreen/just.sh test-eg From 53738441bb1a84f197e41c351baf6a410f4f376f Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Wed, 19 Feb 2025 19:52:47 -0600 Subject: [PATCH 8/9] use upstream --- .evergreen/scripts/configure-env.sh | 2 +- .evergreen/scripts/run-aws-ecs-auth-test.sh | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/.evergreen/scripts/configure-env.sh b/.evergreen/scripts/configure-env.sh index f78fca9f46..16212ad3b1 100755 --- a/.evergreen/scripts/configure-env.sh +++ b/.evergreen/scripts/configure-env.sh @@ -89,7 +89,7 @@ EOT # Write the .env file for drivers-tools. rm -rf $DRIVERS_TOOLS -git clone --branch aws-output-file https://github.com/blink1073/drivers-evergreen-tools.git $DRIVERS_TOOLS +git clone https://github.com/mongodb-labs/drivers-evergreen-tools.git $DRIVERS_TOOLS cat < ${DRIVERS_TOOLS}/.env SKIP_LEGACY_SHELL=1 diff --git a/.evergreen/scripts/run-aws-ecs-auth-test.sh b/.evergreen/scripts/run-aws-ecs-auth-test.sh index 787e0a710b..b8197c4da5 100755 --- a/.evergreen/scripts/run-aws-ecs-auth-test.sh +++ b/.evergreen/scripts/run-aws-ecs-auth-test.sh @@ -9,7 +9,4 @@ set -ex cd "$DRIVERS_TOOLS"/.evergreen/auth_aws . ./activate-authawsvenv.sh . aws_setup.sh ecs -export MONGODB_BINARIES="$MONGODB_BINARIES" -export PROJECT_DIRECTORY="$PROJECT_DIRECTORY" -python aws_tester.py ecs cd - From dc9bfd3980239d2c9cd8feb0bb3e78ca69bb87c7 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Wed, 19 Feb 2025 21:24:52 -0600 Subject: [PATCH 9/9] undo changes --- .evergreen/run-mongodb-aws-ecs-test.sh | 1 - .evergreen/scripts/run-mongodb-aws-test.sh | 6 ++---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/.evergreen/run-mongodb-aws-ecs-test.sh b/.evergreen/run-mongodb-aws-ecs-test.sh index b8e618a87a..f141792420 100755 --- a/.evergreen/run-mongodb-aws-ecs-test.sh +++ b/.evergreen/run-mongodb-aws-ecs-test.sh @@ -33,5 +33,4 @@ cd src rm -rf .venv rm -f .evergreen/scripts/test-env.sh || true bash ./.evergreen/just.sh setup-test -cat .evergreen/scripts/test-env.sh bash .evergreen/just.sh test-eg diff --git a/.evergreen/scripts/run-mongodb-aws-test.sh b/.evergreen/scripts/run-mongodb-aws-test.sh index 0e88c331c1..255f84f295 100755 --- a/.evergreen/scripts/run-mongodb-aws-test.sh +++ b/.evergreen/scripts/run-mongodb-aws-test.sh @@ -24,7 +24,5 @@ echo "Running MONGODB-AWS authentication tests for $1" # Handle credentials and environment setup. . "$DRIVERS_TOOLS"/.evergreen/auth_aws/aws_setup.sh "$1" -if [ "$1" != "ecs" ]; then - TEST_AUTH_AWS=1 AUTH="auth" bash ./.evergreen/just.sh setup-test - bash ./.evergreen/just.sh test-eg -fi +TEST_AUTH_AWS=1 AUTH="auth" bash ./.evergreen/just.sh setup-test +bash ./.evergreen/just.sh test-eg