Skip to content

Commit 3e5f2eb

Browse files
committed
redo virtualenv management
1 parent 7bb98ad commit 3e5f2eb

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

.evergreen/run-tests.sh

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,10 @@ if test -n "$FLE"; then
137137
# Start the KMS servers first so that they are launching while we are
138138
# fetching libmongocrypt.
139139
if test "$DOCKER_PRELOAD" != 1; then
140-
. .evergreen/csfle/activate_venv.sh
140+
# We already have a virtualenv activated for mlaunch,
141+
# install kms dependencies into it.
142+
#. .evergreen/csfle/activate_venv.sh
143+
pip install boto3~=1.19 cryptography~=3.4.8 pykmip~=0.10.0
141144
fi
142145
python3 -u .evergreen/csfle/kms_http_server.py --ca_file .evergreen/x509gen/ca.pem --cert_file .evergreen/x509gen/server.pem --port 7999 &
143146
python3 -u .evergreen/csfle/kms_http_server.py --ca_file .evergreen/x509gen/ca.pem --cert_file .evergreen/x509gen/expired.pem --port 8000 &
@@ -266,11 +269,6 @@ if test -n "$OCSP_MOCK_PID"; then
266269
kill "$OCSP_MOCK_PID"
267270
fi
268271

269-
# KMS virtualenv doesn't have mlaunch, get rid of it.
270-
if test -n "$FLE" && test "$DOCKER_PRELOAD" != 1; then
271-
deactivate
272-
fi
273-
274272
python -m mtools.mlaunch.mlaunch stop --dir "$dbdir"
275273

276274
exit ${test_status}

0 commit comments

Comments
 (0)