Skip to content

RUBY-3308 Fixing serverless test failures #2770

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 2 commits into from
Aug 14, 2023
Merged

RUBY-3308 Fixing serverless test failures #2770

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
057faca
making these changes from a clean slate
jamis Aug 9, 2023
38190b8
propagate CRYPT_SHARED_LIB_PATH from the create-instance.sh script to…
jamis Aug 9, 2023
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
2 changes: 1 addition & 1 deletion .evergreen/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,7 +453,7 @@ functions:
working_dir: "src"
script: |
${PREPARE_SHELL}
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
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

pre:
- func: "fetch source"
Expand Down
2 changes: 1 addition & 1 deletion .evergreen/config/common.yml.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -450,7 +450,7 @@ functions:
working_dir: "src"
script: |
${PREPARE_SHELL}
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
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

pre:
- func: "fetch source"
Expand Down
19 changes: 12 additions & 7 deletions .evergreen/run-tests-serverless.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,19 @@ export MONGODB_URI=`echo ${SERVERLESS_URI} | sed -r 's/mongodb\+srv:\/\//mongodb

export TOPOLOGY="load-balanced"

python3 -u .evergreen/mongodl.py --component crypt_shared -V ${SERVERLESS_MONGODB_VERSION} --out `pwd`/csfle_lib --target `host_distro` || true
if test -f `pwd`/csfle_lib/lib/mongo_crypt_v1.so
then
echo Usinn crypt shared library version ${SERVERLESS_MONGODB_VERSION}
export MONGO_RUBY_DRIVER_CRYPT_SHARED_LIB_PATH=`pwd`/csfle_lib/lib/mongo_crypt_v1.so
if [ -n "${CRYPT_SHARED_LIB_PATH}" ]; then
echo crypt_shared already present at ${CRYPT_SHARED_LIB_PATH} -- using this version
export MONGO_RUBY_DRIVER_CRYPT_SHARED_LIB_PATH=$CRYPT_SHARED_LIB_PATH
else
echo Failed to download crypt shared library
exit -1
python3 -u .evergreen/mongodl.py --component crypt_shared -V ${SERVERLESS_MONGODB_VERSION} --out `pwd`/csfle_lib --target `host_distro` || true
if test -f `pwd`/csfle_lib/lib/mongo_crypt_v1.so
then
echo Usinn crypt shared library version ${SERVERLESS_MONGODB_VERSION}
export MONGO_RUBY_DRIVER_CRYPT_SHARED_LIB_PATH=`pwd`/csfle_lib/lib/mongo_crypt_v1.so
else
echo Failed to download crypt shared library
exit -1
fi
fi

if ! ( test -f /etc/os-release & grep -q ^ID.*rhel /etc/os-release & grep -q ^VERSION_ID.*8.0 /etc/os-release ); then
Expand Down
2 changes: 1 addition & 1 deletion .mod/drivers-evergreen-tools
Open in desktop
Submodule drivers-evergreen-tools updated 7 files
+7 −0 .evergreen/atlas_data_lake/config.yml
+89 −0 .evergreen/auth_aws/setup_secrets.py
+1 −1 .evergreen/auth_oidc/oidc_get_tokens.py
+360 −349 .evergreen/download-mongodb.sh
+11 −3 .evergreen/start-orchestration.sh
+2 −0 .gitignore
+4 −0 action.yml