Skip to content

chore(NODE-6502) Use a python venv wherever we use Python in driver CI #4322

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Nov 11, 2024
Merged

chore(NODE-6502) Use a python venv wherever we use Python in driver CI #4322

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
49a3244
NODE-6502 Use a python venv wherever we use Python in driver CI
blink1073 Nov 5, 2024
37f8a3a
fix
blink1073 Nov 8, 2024
bc0757d
install from branch
blink1073 Nov 8, 2024
45c87b8
Revert "install from branch"
blink1073 Nov 8, 2024
cfa5ab3
address review
blink1073 Nov 8, 2024
d6425f4
undo branch change
blink1073 Nov 8, 2024
fd0ec4f
syntax
blink1073 Nov 8, 2024
3170cfa
rebuild
blink1073 Nov 8, 2024
737e74e
fix usage of scripts
blink1073 Nov 8, 2024
1eb0e28
Merge branch 'main' into NODE-6502
baileympearson Nov 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .evergreen/config.in.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
5 changes: 4 additions & 1 deletion .evergreen/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
5 changes: 4 additions & 1 deletion .evergreen/run-custom-csfle-tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
5 changes: 4 additions & 1 deletion .evergreen/run-socks5-tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 4 additions & 2 deletions .evergreen/run-tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions test/readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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`:
Expand Down