Skip to content

Commit bed8c09

Browse files
authored
RUBY-3308 Fixing serverless test failures (#2770)
* making these changes from a clean slate * propagate CRYPT_SHARED_LIB_PATH from the create-instance.sh script to run-serverless-tests.sh
1 parent 98da223 commit bed8c09

File tree

4 files changed

+15
-10
lines changed

4 files changed

+15
-10
lines changed

Diff for: .evergreen/config.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -453,7 +453,7 @@ functions:
453453
working_dir: "src"
454454
script: |
455455
${PREPARE_SHELL}
456-
SERVERLESS=1 SSL=ssl RVM_RUBY="${RVM_RUBY}" SINGLE_MONGOS="${SINGLE_MONGOS}" SERVERLESS_URI="${SERVERLESS_URI}" FLE="${FLE}" SERVERLESS_MONGODB_VERSION="${SERVERLESS_MONGODB_VERSION}" .evergreen/run-tests-serverless.sh
456+
CRYPT_SHARED_LIB_PATH="${CRYPT_SHARED_LIB_PATH}" SERVERLESS=1 SSL=ssl RVM_RUBY="${RVM_RUBY}" SINGLE_MONGOS="${SINGLE_MONGOS}" SERVERLESS_URI="${SERVERLESS_URI}" FLE="${FLE}" SERVERLESS_MONGODB_VERSION="${SERVERLESS_MONGODB_VERSION}" .evergreen/run-tests-serverless.sh
457457
458458
pre:
459459
- func: "fetch source"

Diff for: .evergreen/config/common.yml.erb

+1-1
Original file line numberDiff line numberDiff line change
@@ -450,7 +450,7 @@ functions:
450450
working_dir: "src"
451451
script: |
452452
${PREPARE_SHELL}
453-
SERVERLESS=1 SSL=ssl RVM_RUBY="${RVM_RUBY}" SINGLE_MONGOS="${SINGLE_MONGOS}" SERVERLESS_URI="${SERVERLESS_URI}" FLE="${FLE}" SERVERLESS_MONGODB_VERSION="${SERVERLESS_MONGODB_VERSION}" .evergreen/run-tests-serverless.sh
453+
CRYPT_SHARED_LIB_PATH="${CRYPT_SHARED_LIB_PATH}" SERVERLESS=1 SSL=ssl RVM_RUBY="${RVM_RUBY}" SINGLE_MONGOS="${SINGLE_MONGOS}" SERVERLESS_URI="${SERVERLESS_URI}" FLE="${FLE}" SERVERLESS_MONGODB_VERSION="${SERVERLESS_MONGODB_VERSION}" .evergreen/run-tests-serverless.sh
454454

455455
pre:
456456
- func: "fetch source"

Diff for: .evergreen/run-tests-serverless.sh

+12-7
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,19 @@ export MONGODB_URI=`echo ${SERVERLESS_URI} | sed -r 's/mongodb\+srv:\/\//mongodb
1616

1717
export TOPOLOGY="load-balanced"
1818

19-
python3 -u .evergreen/mongodl.py --component crypt_shared -V ${SERVERLESS_MONGODB_VERSION} --out `pwd`/csfle_lib --target `host_distro` || true
20-
if test -f `pwd`/csfle_lib/lib/mongo_crypt_v1.so
21-
then
22-
echo Usinn crypt shared library version ${SERVERLESS_MONGODB_VERSION}
23-
export MONGO_RUBY_DRIVER_CRYPT_SHARED_LIB_PATH=`pwd`/csfle_lib/lib/mongo_crypt_v1.so
19+
if [ -n "${CRYPT_SHARED_LIB_PATH}" ]; then
20+
echo crypt_shared already present at ${CRYPT_SHARED_LIB_PATH} -- using this version
21+
export MONGO_RUBY_DRIVER_CRYPT_SHARED_LIB_PATH=$CRYPT_SHARED_LIB_PATH
2422
else
25-
echo Failed to download crypt shared library
26-
exit -1
23+
python3 -u .evergreen/mongodl.py --component crypt_shared -V ${SERVERLESS_MONGODB_VERSION} --out `pwd`/csfle_lib --target `host_distro` || true
24+
if test -f `pwd`/csfle_lib/lib/mongo_crypt_v1.so
25+
then
26+
echo Usinn crypt shared library version ${SERVERLESS_MONGODB_VERSION}
27+
export MONGO_RUBY_DRIVER_CRYPT_SHARED_LIB_PATH=`pwd`/csfle_lib/lib/mongo_crypt_v1.so
28+
else
29+
echo Failed to download crypt shared library
30+
exit -1
31+
fi
2732
fi
2833

2934
if ! ( test -f /etc/os-release & grep -q ^ID.*rhel /etc/os-release & grep -q ^VERSION_ID.*8.0 /etc/os-release ); then

0 commit comments

Comments
 (0)