Skip to content

Commit cd38cbc

Browse files
author
Divjot Arora
authored
GODRIVER-1911 Fix Windows/macos test failures for CSFLE (#603)
This commit addresses two failures that started showing up after GODRIVER-1855: - Set the PYTHON environment variable to point to the local python3 installation before calling set-temp-creds.sh - For Windows tasks, update the libmongocrypt URL to install the latest stable version (v1.2.0)
1 parent 5c0f679 commit cd38cbc

File tree

1 file changed

+18
-2
lines changed

1 file changed

+18
-2
lines changed

.evergreen/config.yml

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,7 @@ functions:
7575
if [ "Windows_NT" = "$OS" ]; then
7676
mkdir -p c:/libmongocrypt/include
7777
mkdir -p c:/libmongocrypt/bin
78-
# TODO: After a stable libmongocrypt 1.1.0 is released in MONGOCRYPT-293, update this URL to: https://s3.amazonaws.com/mciuploads/libmongocrypt/windows/latest_release/libmongocrypt.tar.gz
79-
curl https://s3.amazonaws.com/mciuploads/libmongocrypt/windows/latest_release/libmongocrypt_unstable.tar.gz --output libmongocrypt.tar.gz
78+
curl https://s3.amazonaws.com/mciuploads/libmongocrypt/windows/latest_release/libmongocrypt.tar.gz --output libmongocrypt.tar.gz
8079
tar -xvzf libmongocrypt.tar.gz
8180
cp ./bin/mongocrypt.dll c:/libmongocrypt/bin
8281
cp ./include/mongocrypt/*.h c:/libmongocrypt/include
@@ -304,6 +303,15 @@ functions:
304303
export AWS_SECRET_ACCESS_KEY="${cse_aws_secret_access_key}"
305304
export AWS_DEFAULT_REGION="us-east-1"
306305
${PYTHON3_BINARY} -m venv ./venv
306+
307+
# Set the PYTHON environment variable to point to the active python3 binary. This is used by the
308+
# set-temp-creds.sh script.
309+
if [ "Windows_NT" = "$OS" ]; then
310+
export PYTHON="$(pwd)/venv/Scripts/python"
311+
else
312+
export PYTHON="$(pwd)/venv/bin/python"
313+
fi
314+
307315
./venv/${VENV_BIN_DIR|bin}/pip3 install boto3
308316
. ${DRIVERS_TOOLS}/.evergreen/csfle/set-temp-creds.sh
309317
fi
@@ -476,6 +484,14 @@ functions:
476484
export AWS_DEFAULT_REGION="us-east-1"
477485
${PYTHON3_BINARY} -m venv ./venv
478486
./venv/${VENV_BIN_DIR|bin}/pip3 install boto3
487+
488+
# Set the PYTHON environment variable to point to the active python3 binary. This is used by the
489+
# set-temp-creds.sh script.
490+
if [ "Windows_NT" = "$OS" ]; then
491+
export PYTHON="$(pwd)/venv/Scripts/python"
492+
else
493+
export PYTHON="$(pwd)/venv/bin/python"
494+
fi
479495
. ${DRIVERS_TOOLS}/.evergreen/csfle/set-temp-creds.sh
480496
481497
export GOFLAGS=-mod=vendor

0 commit comments

Comments
 (0)