@@ -214,47 +214,45 @@ functions:
214
214
file : src/serverless-expansion.yml
215
215
- command : shell.exec
216
216
params :
217
- shell : " bash"
217
+ shell : bash
218
218
script : |
219
219
${PREPARE_SHELL}
220
-
220
+
221
221
if [ -z "${SERVERLESS_MONGODB_VERSION}" ]; then
222
222
echo "expected SERVERLESS_MONGODB_VERSION to be set"
223
223
exit 1
224
224
fi
225
-
225
+
226
+ . ${DRIVERS_TOOLS}/.evergreen/find-python3.sh
227
+ PYTHON_BINARY="$(find_python3)" || exit 1
228
+
226
229
# Download the enterprise server download for current platform to $MONGODB_BINARIES.
227
230
# This is required for tests that need mongocryptd.
228
231
# $MONGODB_BINARIES is added to the $PATH in fetch-source.
229
- ${PYTHON3_BINARY } $DRIVERS_TOOLS/.evergreen/mongodl.py \
232
+ ${PYTHON_BINARY } ${ DRIVERS_TOOLS} /.evergreen/mongodl.py \
230
233
--component archive \
231
234
--version ${SERVERLESS_MONGODB_VERSION} \
232
235
--edition enterprise \
233
236
--out $MONGODB_BINARIES \
234
237
--strip-path-components 2
235
-
238
+
236
239
# Download the crypt_shared dynamic library for the current platform.
237
- ${PYTHON3_BINARY } $DRIVERS_TOOLS/.evergreen/mongodl.py \
240
+ ${PYTHON_BINARY } ${ DRIVERS_TOOLS} /.evergreen/mongodl.py \
238
241
--component crypt_shared \
239
242
--version ${SERVERLESS_MONGODB_VERSION} \
240
243
--edition enterprise \
241
244
--out . \
242
245
--only "**/mongo_crypt_v1.*" \
243
246
--strip-path-components 1
244
-
247
+
245
248
# Find the crypt_shared library file in the current directory and set the CRYPT_SHARED_LIB_PATH to
246
249
# the path of that file. Only look for .so, .dll, or .dylib files to prevent matching any other
247
250
# downloaded files.
248
251
CRYPT_SHARED_LIB_PATH="$(find $(pwd) -maxdepth 1 -type f \
249
252
-name 'mongo_crypt_v1.so' -o \
250
253
-name 'mongo_crypt_v1.dll' -o \
251
254
-name 'mongo_crypt_v1.dylib')"
252
-
253
- # If we're on Windows, convert the "cygdrive" path to Windows-style paths.
254
- if [ "Windows_NT" = "$OS" ]; then
255
- CRYPT_SHARED_LIB_PATH=$(cygpath -m $CRYPT_SHARED_LIB_PATH)
256
- fi
257
-
255
+
258
256
echo "CRYPT_SHARED_LIB_PATH: $CRYPT_SHARED_LIB_PATH" >> crypt-expansion.yml
259
257
260
258
# Load the expansion file to make an evergreen variable with the current unique version
@@ -429,18 +427,20 @@ functions:
429
427
- command : shell.exec
430
428
# Init venv without background:true to install dependencies
431
429
params :
430
+ shell : bash
432
431
script : |-
433
432
set -o errexit
434
433
cd ${DRIVERS_TOOLS}/.evergreen/csfle
435
- . ./activate_venv .sh
434
+ . ./activate-kmstlsvenv .sh
436
435
- command : shell.exec
437
436
params :
438
437
background : true
438
+ shell : bash
439
439
# Use different ports for KMS HTTP servers to avoid conflicts with load balancers
440
440
script : |-
441
441
set -o errexit
442
442
cd ${DRIVERS_TOOLS}/.evergreen/csfle
443
- . ./activate_venv .sh
443
+ . ./activate-kmstlsvenv .sh
444
444
python -u kms_http_server.py --ca_file ../x509gen/ca.pem --cert_file ../x509gen/expired.pem --port 8100 &
445
445
python -u kms_http_server.py --ca_file ../x509gen/ca.pem --cert_file ../x509gen/wrong-host.pem --port 8101 &
446
446
python -u kms_http_server.py --ca_file ../x509gen/ca.pem --cert_file ../x509gen/server.pem --port 8102 --require_client_cert &
@@ -473,7 +473,7 @@ functions:
473
473
export AWS_DEFAULT_REGION="us-east-1"
474
474
475
475
pushd ${DRIVERS_TOOLS}/.evergreen/csfle
476
- . ./activate_venv .sh
476
+ . ./activate-kmstlsvenv .sh
477
477
. ./set-temp-creds.sh
478
478
popd
479
479
0 commit comments