diff --git a/.evergreen/config.in.yml b/.evergreen/config.in.yml index d33a23fc37a..2baf9fd132d 100644 --- a/.evergreen/config.in.yml +++ b/.evergreen/config.in.yml @@ -227,7 +227,10 @@ functions: # Get access to the AWS temporary credentials: echo "adding temporary AWS credentials to environment" # CSFLE_AWS_TEMP_ACCESS_KEY_ID, CSFLE_AWS_TEMP_SECRET_ACCESS_KEY, CSFLE_AWS_TEMP_SESSION_TOKEN - . "$DRIVERS_TOOLS"/.evergreen/csfle/set-temp-creds.sh + pushd "$DRIVERS_TOOLS"/.evergreen/csfle + . ./activate-kmstlsvenv.sh + . ./set-temp-creds.sh + popd MONGODB_URI="${MONGODB_URI}" \ AUTH=${AUTH} SSL=${SSL} TEST_CSFLE=true \ diff --git a/.evergreen/config.yml b/.evergreen/config.yml index 140eb50e213..3fee70b6d8c 100644 --- a/.evergreen/config.yml +++ b/.evergreen/config.yml @@ -199,7 +199,10 @@ functions: # Get access to the AWS temporary credentials: echo "adding temporary AWS credentials to environment" # CSFLE_AWS_TEMP_ACCESS_KEY_ID, CSFLE_AWS_TEMP_SECRET_ACCESS_KEY, CSFLE_AWS_TEMP_SESSION_TOKEN - . "$DRIVERS_TOOLS"/.evergreen/csfle/set-temp-creds.sh + pushd "$DRIVERS_TOOLS"/.evergreen/csfle + . ./activate-kmstlsvenv.sh + . ./set-temp-creds.sh + popd MONGODB_URI="${MONGODB_URI}" \ AUTH=${AUTH} SSL=${SSL} TEST_CSFLE=true \ diff --git a/.evergreen/run-custom-csfle-tests.sh b/.evergreen/run-custom-csfle-tests.sh index 5b0a3c96855..787ef8bbba8 100644 --- a/.evergreen/run-custom-csfle-tests.sh +++ b/.evergreen/run-custom-csfle-tests.sh @@ -20,7 +20,10 @@ set -o errexit # Exit the script with error if any of the commands fail # Get access to the AWS temporary credentials: echo "adding temporary AWS credentials to environment" # CSFLE_AWS_TEMP_ACCESS_KEY_ID, CSFLE_AWS_TEMP_SECRET_ACCESS_KEY, CSFLE_AWS_TEMP_SESSION_TOKEN -. "$DRIVERS_TOOLS"/.evergreen/csfle/set-temp-creds.sh +pushd "$DRIVERS_TOOLS"/.evergreen/csfle +. ./activate-kmstlsvenv.sh +. ./set-temp-creds.sh +popd export MONGODB_URI=${MONGODB_URI} export KMIP_TLS_CA_FILE="${DRIVERS_TOOLS}/.evergreen/x509gen/ca.pem" diff --git a/.evergreen/run-socks5-tests.sh b/.evergreen/run-socks5-tests.sh index f0e146e7c6e..dac6a159e73 100644 --- a/.evergreen/run-socks5-tests.sh +++ b/.evergreen/run-socks5-tests.sh @@ -18,7 +18,10 @@ function setup_fle() { # Get access to the AWS temporary credentials: echo "adding temporary AWS credentials to environment" # CSFLE_AWS_TEMP_ACCESS_KEY_ID, CSFLE_AWS_TEMP_SECRET_ACCESS_KEY, CSFLE_AWS_TEMP_SESSION_TOKEN - . "$DRIVERS_TOOLS"/.evergreen/csfle/set-temp-creds.sh + pushd "$DRIVERS_TOOLS"/.evergreen/csfle + . ./activate-kmstlsvenv.sh + . ./set-temp-creds.sh + popd export KMIP_TLS_CA_FILE="${DRIVERS_TOOLS}/.evergreen/x509gen/ca.pem" export KMIP_TLS_CERT_FILE="${DRIVERS_TOOLS}/.evergreen/x509gen/client.pem" diff --git a/.evergreen/run-tests.sh b/.evergreen/run-tests.sh index 755732b9def..9bad420f7f3 100755 --- a/.evergreen/run-tests.sh +++ b/.evergreen/run-tests.sh @@ -45,11 +45,13 @@ if [[ -z "${CLIENT_ENCRYPTION}" ]]; then unset AWS_ACCESS_KEY_ID; unset AWS_SECRET_ACCESS_KEY; else - pip install --upgrade boto3 + pushd "$DRIVERS_TOOLS/.evergreen/csfle" + . ./activate-kmstlsvenv.sh # Get access to the AWS temporary credentials: echo "adding temporary AWS credentials to environment" # CSFLE_AWS_TEMP_ACCESS_KEY_ID, CSFLE_AWS_TEMP_SECRET_ACCESS_KEY, CSFLE_AWS_TEMP_SESSION_TOKEN - source "$DRIVERS_TOOLS"/.evergreen/csfle/set-temp-creds.sh + source set-temp-creds.sh + popd fi npm install @mongodb-js/zstd diff --git a/test/readme.md b/test/readme.md index 40872c895c5..deae82a2deb 100644 --- a/test/readme.md +++ b/test/readme.md @@ -496,8 +496,8 @@ The following steps will walk you through how to run the tests for CSFLE. 1. Set temporary AWS credentials ``` - pip3 install boto3 - PYTHON="python3" source /path/to/mongodb-labs/drivers-evergreen-tools/.evergreen/csfle/set-temp-creds.sh + source /path/to/mongodb-labs/drivers-evergreen-tools/.evergreen/csfle/activate-kmstlsvenv.sh + source /path/to/mongodb-labs/drivers-evergreen-tools/.evergreen/csfle/set-temp-creds.sh ``` Alternatively, for fish users, the following script can be substituted for `set-temp-creds.sh`: