From 6d18db004f665774ef10269068aad7fb40ea36d3 Mon Sep 17 00:00:00 2001 From: BorisDog Date: Fri, 8 Mar 2024 13:14:36 -0800 Subject: [PATCH 1/3] - Add OS variable to PREPARE_SHELL --- evergreen/evergreen.yml | 31 ++++++++++--------------------- 1 file changed, 10 insertions(+), 21 deletions(-) diff --git a/evergreen/evergreen.yml b/evergreen/evergreen.yml index cf377e1ee39..7f83d70de06 100644 --- a/evergreen/evergreen.yml +++ b/evergreen/evergreen.yml @@ -86,6 +86,7 @@ functions: export PACKAGE_VERSION="$PACKAGE_VERSION" export TMPDIR="$MONGO_ORCHESTRATION_HOME/db" export PATH="$DOTNET_SDK_PATH:$MONGODB_BINARIES:$PATH" + export OS=${OS} export PROJECT="${project}" EOT # See what we've done @@ -101,7 +102,7 @@ functions: params: script: | ${PREPARE_SHELL} - OS=${OS} sh ${PROJECT_DIRECTORY}/evergreen/install-dotnet.sh + sh ${PROJECT_DIRECTORY}/evergreen/install-dotnet.sh prepare-resources: - command: shell.exec @@ -276,10 +277,9 @@ functions: working_dir: "mongo-csharp-driver" script: | ${PREPARE_SHELL} - OS=${OS} evergreen/add-ca-certs.sh + evergreen/add-ca-certs.sh AUTH="${AUTH}" SSL="${SSL}" \ FRAMEWORK=${FRAMEWORK} \ - OS=${OS} \ SINGLE_MONGOS_LB_URI="${SINGLE_MONGOS_LB_URI}" \ MULTI_MONGOS_LB_URI="${MULTI_MONGOS_LB_URI}" \ evergreen/run-load-balancer-tests.sh @@ -308,13 +308,11 @@ functions: . ./evergreen/set-virtualenv.sh . ./evergreen/set-temp-fle-aws-creds.sh ${PREPARE_SHELL} - OS=${OS} \ - evergreen/add-ca-certs.sh + evergreen/add-ca-certs.sh AUTH=${AUTH} \ SSL=${SSL} \ MONGODB_URI="${MONGODB_URI}" \ TOPOLOGY=${TOPOLOGY} \ - OS=${OS} \ COMPRESSOR=${COMPRESSOR} \ CLIENT_PEM=${DRIVERS_TOOLS}/.evergreen/x509gen/client.pem \ REQUIRE_API_VERSION=${REQUIRE_API_VERSION} \ @@ -322,8 +320,7 @@ functions: CRYPT_SHARED_LIB_PATH=${CRYPT_SHARED_LIB_PATH} \ evergreen/run-tests.sh echo "Skipping certificate removal..." - OS=${OS} \ - evergreen/cleanup-test-resources.sh + evergreen/cleanup-test-resources.sh run-csfle-with-mocked-kms-tests: - command: shell.exec @@ -343,20 +340,17 @@ functions: export GCE_METADATA_HOST="localhost:5000" export AZURE_IMDS_MOCK_ENDPOINT="localhost:8080" ${PREPARE_SHELL} - OS=${OS} \ - evergreen/add-ca-certs.sh + evergreen/add-ca-certs.sh AUTH=${AUTH} \ SSL=${SSL} \ MONGODB_URI="${MONGODB_URI}" \ TOPOLOGY=${TOPOLOGY} \ - OS=${OS} \ CLIENT_PEM=${DRIVERS_TOOLS}/.evergreen/x509gen/client.pem \ FRAMEWORK=${FRAMEWORK} \ TARGET="TestCsfleWithMockedKms" \ CRYPT_SHARED_LIB_PATH=${CRYPT_SHARED_LIB_PATH} \ evergreen/run-tests.sh - OS=${OS} \ - evergreen/cleanup-test-resources.sh + evergreen/cleanup-test-resources.sh run-csfle-with-mongocryptd-tests: - command: shell.exec @@ -375,13 +369,11 @@ functions: . ./evergreen/set-virtualenv.sh . ./evergreen/set-temp-fle-aws-creds.sh ${PREPARE_SHELL} - OS=${OS} \ - evergreen/add-ca-certs.sh + evergreen/add-ca-certs.sh AUTH=${AUTH} \ SSL=${SSL} \ MONGODB_URI="${MONGODB_URI}" \ TOPOLOGY=${TOPOLOGY} \ - OS=${OS} \ COMPRESSOR=${COMPRESSOR} \ CLIENT_PEM=${DRIVERS_TOOLS}/.evergreen/x509gen/client.pem \ REQUIRE_API_VERSION=${REQUIRE_API_VERSION} \ @@ -390,8 +382,7 @@ functions: CRYPT_SHARED_LIB_PATH="" \ evergreen/run-tests.sh echo "Skipping certificate removal..." - OS=${OS} \ - evergreen/cleanup-test-resources.sh + evergreen/cleanup-test-resources.sh run-atlas-connectivity-tests: - command: shell.exec @@ -499,7 +490,7 @@ functions: echo "This platform does not support the EC2 auth test, skipping..." exit 0 fi - DRIVERS_TOOLS=${DRIVERS_TOOLS} OS=${OS} ASSERT_NO_URI_CREDS=true evergreen/run-mongodb-aws-test.sh ec2 + DRIVERS_TOOLS=${DRIVERS_TOOLS} ASSERT_NO_URI_CREDS=true evergreen/run-mongodb-aws-test.sh ec2 run-aws-auth-test-with-aws-ECS-credentials: - command: shell.exec @@ -738,12 +729,10 @@ functions: script: | set +x ${PREPARE_SHELL} - OS=${OS} \ AUTH=${AUTH} \ SSL=${SSL} \ MONGODB_URI="${MONGODB_URI}" \ TOPOLOGY=${TOPOLOGY} \ - OS=${OS} \ COMPRESSOR=${COMPRESSOR} \ CLIENT_PEM=${DRIVERS_TOOLS}/.evergreen/x509gen/client.pem \ REQUIRE_API_VERSION=${REQUIRE_API_VERSION} \ From a73bbaba121621dd36adb3f9ce9396d264bf0107 Mon Sep 17 00:00:00 2001 From: BorisDog Date: Tue, 12 Mar 2024 14:51:29 -0700 Subject: [PATCH 2/3] - Revert and add OS to run-plain-auth-tests --- evergreen/evergreen.yml | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/evergreen/evergreen.yml b/evergreen/evergreen.yml index 7f83d70de06..6c6219469c5 100644 --- a/evergreen/evergreen.yml +++ b/evergreen/evergreen.yml @@ -86,7 +86,6 @@ functions: export PACKAGE_VERSION="$PACKAGE_VERSION" export TMPDIR="$MONGO_ORCHESTRATION_HOME/db" export PATH="$DOTNET_SDK_PATH:$MONGODB_BINARIES:$PATH" - export OS=${OS} export PROJECT="${project}" EOT # See what we've done @@ -102,7 +101,7 @@ functions: params: script: | ${PREPARE_SHELL} - sh ${PROJECT_DIRECTORY}/evergreen/install-dotnet.sh + OS=${OS} sh ${PROJECT_DIRECTORY}/evergreen/install-dotnet.sh prepare-resources: - command: shell.exec @@ -277,9 +276,10 @@ functions: working_dir: "mongo-csharp-driver" script: | ${PREPARE_SHELL} - evergreen/add-ca-certs.sh + OS=${OS} evergreen/add-ca-certs.sh AUTH="${AUTH}" SSL="${SSL}" \ FRAMEWORK=${FRAMEWORK} \ + OS=${OS} \ SINGLE_MONGOS_LB_URI="${SINGLE_MONGOS_LB_URI}" \ MULTI_MONGOS_LB_URI="${MULTI_MONGOS_LB_URI}" \ evergreen/run-load-balancer-tests.sh @@ -308,11 +308,13 @@ functions: . ./evergreen/set-virtualenv.sh . ./evergreen/set-temp-fle-aws-creds.sh ${PREPARE_SHELL} - evergreen/add-ca-certs.sh + OS=${OS} \ + evergreen/add-ca-certs.sh AUTH=${AUTH} \ SSL=${SSL} \ MONGODB_URI="${MONGODB_URI}" \ TOPOLOGY=${TOPOLOGY} \ + OS=${OS} \ COMPRESSOR=${COMPRESSOR} \ CLIENT_PEM=${DRIVERS_TOOLS}/.evergreen/x509gen/client.pem \ REQUIRE_API_VERSION=${REQUIRE_API_VERSION} \ @@ -320,7 +322,8 @@ functions: CRYPT_SHARED_LIB_PATH=${CRYPT_SHARED_LIB_PATH} \ evergreen/run-tests.sh echo "Skipping certificate removal..." - evergreen/cleanup-test-resources.sh + OS=${OS} \ + evergreen/cleanup-test-resources.sh run-csfle-with-mocked-kms-tests: - command: shell.exec @@ -340,17 +343,20 @@ functions: export GCE_METADATA_HOST="localhost:5000" export AZURE_IMDS_MOCK_ENDPOINT="localhost:8080" ${PREPARE_SHELL} - evergreen/add-ca-certs.sh + OS=${OS} \ + evergreen/add-ca-certs.sh AUTH=${AUTH} \ SSL=${SSL} \ MONGODB_URI="${MONGODB_URI}" \ TOPOLOGY=${TOPOLOGY} \ + OS=${OS} \ CLIENT_PEM=${DRIVERS_TOOLS}/.evergreen/x509gen/client.pem \ FRAMEWORK=${FRAMEWORK} \ TARGET="TestCsfleWithMockedKms" \ CRYPT_SHARED_LIB_PATH=${CRYPT_SHARED_LIB_PATH} \ evergreen/run-tests.sh - evergreen/cleanup-test-resources.sh + OS=${OS} \ + evergreen/cleanup-test-resources.sh run-csfle-with-mongocryptd-tests: - command: shell.exec @@ -369,11 +375,13 @@ functions: . ./evergreen/set-virtualenv.sh . ./evergreen/set-temp-fle-aws-creds.sh ${PREPARE_SHELL} - evergreen/add-ca-certs.sh + OS=${OS} \ + evergreen/add-ca-certs.sh AUTH=${AUTH} \ SSL=${SSL} \ MONGODB_URI="${MONGODB_URI}" \ TOPOLOGY=${TOPOLOGY} \ + OS=${OS} \ COMPRESSOR=${COMPRESSOR} \ CLIENT_PEM=${DRIVERS_TOOLS}/.evergreen/x509gen/client.pem \ REQUIRE_API_VERSION=${REQUIRE_API_VERSION} \ @@ -382,7 +390,8 @@ functions: CRYPT_SHARED_LIB_PATH="" \ evergreen/run-tests.sh echo "Skipping certificate removal..." - evergreen/cleanup-test-resources.sh + OS=${OS} \ + evergreen/cleanup-test-resources.sh run-atlas-connectivity-tests: - command: shell.exec @@ -490,7 +499,7 @@ functions: echo "This platform does not support the EC2 auth test, skipping..." exit 0 fi - DRIVERS_TOOLS=${DRIVERS_TOOLS} ASSERT_NO_URI_CREDS=true evergreen/run-mongodb-aws-test.sh ec2 + DRIVERS_TOOLS=${DRIVERS_TOOLS} OS=${OS} ASSERT_NO_URI_CREDS=true evergreen/run-mongodb-aws-test.sh ec2 run-aws-auth-test-with-aws-ECS-credentials: - command: shell.exec @@ -733,6 +742,7 @@ functions: SSL=${SSL} \ MONGODB_URI="${MONGODB_URI}" \ TOPOLOGY=${TOPOLOGY} \ + OS=${OS} \ COMPRESSOR=${COMPRESSOR} \ CLIENT_PEM=${DRIVERS_TOOLS}/.evergreen/x509gen/client.pem \ REQUIRE_API_VERSION=${REQUIRE_API_VERSION} \ From acc2c432a8622f7f8fd084dfcff8a42927648507 Mon Sep 17 00:00:00 2001 From: BorisDog Date: Tue, 12 Mar 2024 15:06:34 -0700 Subject: [PATCH 3/3] - fix OS --- evergreen/evergreen.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/evergreen/evergreen.yml b/evergreen/evergreen.yml index 6c6219469c5..8521ecf041f 100644 --- a/evergreen/evergreen.yml +++ b/evergreen/evergreen.yml @@ -101,7 +101,7 @@ functions: params: script: | ${PREPARE_SHELL} - OS=${OS} sh ${PROJECT_DIRECTORY}/evergreen/install-dotnet.sh + sh ${PROJECT_DIRECTORY}/evergreen/install-dotnet.sh prepare-resources: - command: shell.exec @@ -437,7 +437,8 @@ functions: MONGODB_URI: ${plain_auth_mongodb_uri} script: | ${PREPARE_SHELL} - . evergreen/run-plain-auth-tests.sh + OS=${OS} \ + evergreen/run-plain-auth-tests.sh run-performance-tests: - command: shell.exec