diff --git a/.evergreen/activate-kms-venv.sh b/.evergreen/activate-kms-venv.sh index 4e8effc76c0..9abf37dc7bf 100755 --- a/.evergreen/activate-kms-venv.sh +++ b/.evergreen/activate-kms-venv.sh @@ -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 diff --git a/.evergreen/run-azure-kms-mock-server.sh b/.evergreen/run-azure-kms-mock-server.sh index 06d07236e91..396106c2b66 100644 --- a/.evergreen/run-azure-kms-mock-server.sh +++ b/.evergreen/run-azure-kms-mock-server.sh @@ -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" diff --git a/.evergreen/run-kmip-server.sh b/.evergreen/run-kmip-server.sh index c0a3f0f691d..42cea0bbd40 100755 --- a/.evergreen/run-kmip-server.sh +++ b/.evergreen/run-kmip-server.sh @@ -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 diff --git a/.evergreen/run-kms-servers.sh b/.evergreen/run-kms-servers.sh index 8181a4d2f51..5658b1e676f 100755 --- a/.evergreen/run-kms-servers.sh +++ b/.evergreen/run-kms-servers.sh @@ -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 & diff --git a/.evergreen/run-tests.sh b/.evergreen/run-tests.sh index 755732b9def..d2a313445aa 100755 --- a/.evergreen/run-tests.sh +++ b/.evergreen/run-tests.sh @@ -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