Skip to content

CXX-2612 Use DET hygienic scripts for Python binary selection and venv creation #913

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
Dec 19, 2022
Merged

CXX-2612 Use DET hygienic scripts for Python binary selection and venv creation #913

Changes from 5 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
d219f77
Replace activate_venv.sh with activate-kmstlsvenv.sh
eramongodb Nov 29, 2022
f1da74e
Replace manual Python selection in compile function
eramongodb Dec 16, 2022
69d53a5
Use venv-utils.sh in stop_mongod function
eramongodb Dec 16, 2022
dd05792
Fix incorrect whitespacing in test function
eramongodb Dec 16, 2022
91b5805
Use eramongodb/drivers-evergreen-tools
eramongodb Dec 16, 2022
89eac0c
Format collection.cpp and uri.cpp to address lint task failure
eramongodb Dec 17, 2022
480aec8
Revert "Use eramongodb/drivers-evergreen-tools"
eramongodb Dec 16, 2022
7ab3d07
Guard cd to potentially missing DET repo
eramongodb Dec 17, 2022
8a05f6a
CXX-2628 Apply Python >=3.10 selection workaround used by C Driver
eramongodb Dec 16, 2022
60ca2ff
Remove special-casing of TLS test cert files
eramongodb Dec 16, 2022
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
51 changes: 21 additions & 30 deletions .mci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ functions:
shell: bash
script: |
if [ ! -d "drivers-evergreen-tools" ]; then
git clone [email protected]:mongodb-labs/drivers-evergreen-tools.git
git clone [email protected]:eramongodb/drivers-evergreen-tools.git --depth 1 --branch det-scripts
fi
cd drivers-evergreen-tools
export DRIVERS_TOOLS=$(pwd)
Expand Down Expand Up @@ -177,7 +177,7 @@ functions:
set -o errexit
set -o pipefail
if [ ! -d "drivers-evergreen-tools" ]; then
git clone [email protected]:mongodb-labs/drivers-evergreen-tools.git
git clone [email protected]:eramongodb/drivers-evergreen-tools.git --depth 1 --branch det-scripts
fi
cd drivers-evergreen-tools
export DRIVERS_TOOLS=$(pwd)
Expand Down Expand Up @@ -214,12 +214,10 @@ functions:
set -o errexit
set -o pipefail
cd drivers-evergreen-tools/.evergreen/orchestration
if [ -f venv/bin/activate ]; then
. venv/bin/activate
elif [ -f venv/Scripts/activate ]; then
. venv/Scripts/activate
. ../venv-utils.sh
if venvactivate venv; then
mongo-orchestration stop
fi
mongo-orchestration stop

"install_c_driver":
- command: expansions.update
Expand Down Expand Up @@ -282,7 +280,7 @@ functions:
script: |-
set -o errexit
if [ ! -d "drivers-evergreen-tools" ]; then
git clone [email protected]:mongodb-labs/drivers-evergreen-tools.git --depth=1
git clone [email protected]:eramongodb/drivers-evergreen-tools.git --depth 1 --branch det-scripts
fi

"run_kms_servers":
Expand All @@ -293,11 +291,11 @@ functions:
set -o errexit
echo "Preparing CSFLE venv environment..."
cd ./drivers-evergreen-tools/.evergreen/csfle
# This function ensures future invocations of activate_venv.sh conducted in
# This function ensures future invocations of activate-kmstlsvenv.sh conducted in
# parallel do not race to setup a venv environment; it has already been prepared.
# This primarily addresses the situation where the "test" and "run_kms_servers"
# functions invoke 'activate_venv.sh' simultaneously.
. ./activate_venv.sh
# functions invoke 'activate-kmstlsvenv.sh' simultaneously.
. ./activate-kmstlsvenv.sh
deactivate
echo "Preparing CSFLE venv environment... done."
- command: shell.exec
Expand All @@ -308,7 +306,7 @@ functions:
set -o errexit
echo "Starting mock KMS servers..."
cd ./drivers-evergreen-tools/.evergreen/csfle
. ./activate_venv.sh
. ./activate-kmstlsvenv.sh
python -u kms_http_server.py --ca_file ../x509gen/ca.pem --cert_file ../x509gen/server.pem --port 8999 &
python -u kms_http_server.py --ca_file ../x509gen/ca.pem --cert_file ../x509gen/expired.pem --port 9000 &
python -u kms_http_server.py --ca_file ../x509gen/ca.pem --cert_file ../x509gen/wrong-host.pem --port 9001 &
Expand Down Expand Up @@ -346,21 +344,14 @@ functions:
fi
export CMAKE=${cmake}

if [ "x$(lsb_release -cs)" = "xtrusty" -a -f /opt/mongodbtoolchain/v2/bin/python ]; then
/opt/mongodbtoolchain/v2/bin/python -m virtualenv venv
elif ! python -m virtualenv venv 2>/dev/null; then
/opt/mongodbtoolchain/v3/bin/python3 -m venv venv
if [ ! -d ../drivers-evergreen-tools ]; then
git clone [email protected]:eramongodb/drivers-evergreen-tools.git ../drivers-evergreen-tools --depth 1 --branch det-scripts
fi
. ../drivers-evergreen-tools/.evergreen/find-python3.sh
. ../drivers-evergreen-tools/.evergreen/venv-utils.sh

cd venv
if [ -f bin/activate ]; then
. bin/activate
./bin/pip install GitPython
elif [ -f Scripts/activate ]; then
. Scripts/activate
./Scripts/pip install GitPython
fi
cd ..
venvcreate "$(find_python3)" venv
python -m pip install GitPython

export GENERATOR="${generator}"

Expand Down Expand Up @@ -444,11 +435,11 @@ functions:
export AWS_SECRET_ACCESS_KEY="${cse_aws_secret_access_key}"
export AWS_ACCESS_KEY_ID="${cse_aws_access_key_id}"
export AWS_DEFAULT_REGION="us-east-1"
echo "Running activate_venv.sh..."
. ./activate_venv.sh
echo "Running activate_venv.sh... done."
echo "Running activate-kmstlsvenv.sh..."
. ./activate-kmstlsvenv.sh
echo "Running activate-kmstlsvenv.sh... done."
echo "Running set-temp-creds.sh..."
PYTHON="$(type -P python)" . ./set-temp-creds.sh
. ./set-temp-creds.sh
echo "Running set-temp-creds.sh... done."
deactivate
popd # "$DRIVERS_TOOLS/.evergreen/csfle"
Expand All @@ -460,7 +451,7 @@ functions:
exit 1
fi

if [ "Windows_NT" == "$OS"]; then
if [ "Windows_NT" == "$OS" ]; then
export MONGOCXX_TEST_CSFLE_TLS_CA_FILE=$DRIVERS_TOOLS\.evergreen\x509gen\ca.pem
export MONGOCXX_TEST_CSFLE_TLS_CERTIFICATE_KEY_FILE=$DRIVERS_TOOLS\.evergreen\x509gen\client.pem
else
Expand Down