Skip to content

ci(...): use virtualenv and find_python to use the correct python version in CI #4308

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

Closed
wants to merge 1 commit into from
Closed

ci(...): use virtualenv and find_python to use the correct python version in CI #4308

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 2 additions & 6 deletions .evergreen/activate-kms-venv.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
#!/bin/bash
set -o errexit # Exit the script with error if any of the commands fail

cd ${DRIVERS_TOOLS}/.evergreen/csfle
pushd ${DRIVERS_TOOLS}/.evergreen/csfle
. ./activate-kmstlsvenv.sh

if [ "Windows_NT" = "$OS" ]; then
echo "export PYTHON_EXEC='kmstlsvenv/Scripts/python.exe'" > prepare-kmsvenv.sh
else
echo "export PYTHON_EXEC='./kmstlsvenv/bin/python3'" > prepare-kmsvenv.sh
fi
popd
9 changes: 8 additions & 1 deletion .evergreen/run-azure-kms-mock-server.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,13 @@ if [ -z ${DRIVERS_TOOLS+omitted} ]; then echo "DRIVERS_TOOLS is unset" && exit 1

set -o errexit

python3 $DRIVERS_TOOLS/.evergreen/csfle/bottle.py fake_azure:imds &
source ./activate-kms-venv.sh


echo "Python version information"
echo "which python?: ${which python}"
echo "python -v: ${python -v}"

python $DRIVERS_TOOLS/.evergreen/csfle/bottle.py fake_azure:imds &

echo "Running Azure KMS idms server on port 8080"
10 changes: 6 additions & 4 deletions .evergreen/run-kmip-server.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
#!/bin/bash
set -o errexit # Exit the script with error if any of the commands fail

cd ${DRIVERS_TOOLS}/.evergreen/csfle
. ./prepare-kmsvenv.sh
source ./activate-kms-venv.sh

echo "$PYTHON_EXEC"

$PYTHON_EXEC -u kms_kmip_server.py \
echo "Python version information"
echo "which python?: ${which python}"
echo "python -v: ${python -v}"

python -u kms_kmip_server.py \
--ca_file ../x509gen/ca.pem \
--cert_file ../x509gen/server.pem \
--port 5698
13 changes: 7 additions & 6 deletions .evergreen/run-kms-servers.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
#!/bin/bash
set -o errexit # Exit the script with error if any of the commands fail

cd ${DRIVERS_TOOLS}/.evergreen/csfle
. ./prepare-kmsvenv.sh
source ./activate-kms-venv.sh

echo "$PYTHON_EXEC"
echo "Python version information"
echo "which python?: ${which python}"
echo "python -v: ${python -v}"

$PYTHON_EXEC -u kms_http_server.py --ca_file ../x509gen/ca.pem --cert_file ../x509gen/expired.pem --port 8000 &
$PYTHON_EXEC -u kms_http_server.py --ca_file ../x509gen/ca.pem --cert_file ../x509gen/wrong-host.pem --port 8001 &
$PYTHON_EXEC -u kms_http_server.py --ca_file ../x509gen/ca.pem --cert_file ../x509gen/server.pem --port 8002 --require_client_cert &
python -u kms_http_server.py --ca_file ../x509gen/ca.pem --cert_file ../x509gen/expired.pem --port 8000 &
python -u kms_http_server.py --ca_file ../x509gen/ca.pem --cert_file ../x509gen/wrong-host.pem --port 8001 &
python -u kms_http_server.py --ca_file ../x509gen/ca.pem --cert_file ../x509gen/server.pem --port 8002 --require_client_cert &
3 changes: 2 additions & 1 deletion .evergreen/run-tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@ if [[ -z "${CLIENT_ENCRYPTION}" ]]; then
unset AWS_ACCESS_KEY_ID;
unset AWS_SECRET_ACCESS_KEY;
else
pip install --upgrade boto3
source "$DRIVERS_TOOLS/.evergreen/venv-utils.sh"
venvactivate "$DRIVERS_TOOLS/.evergreen/orchestration/venv" pip install --upgrade boto3
# 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
Expand Down