From 057faca771978a7c8a2f06c558552634a989f402 Mon Sep 17 00:00:00 2001
From: Jamis Buck <jamis.buck@mongodb.com>
Date: Wed, 9 Aug 2023 11:14:55 -0600
Subject: [PATCH 1/2] making these changes from a clean slate

---
 .evergreen/run-tests-serverless.sh | 19 ++++++++++++-------
 .mod/drivers-evergreen-tools       |  2 +-
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/.evergreen/run-tests-serverless.sh b/.evergreen/run-tests-serverless.sh
index 4bcd983ade..32bd9ea110 100755
--- a/.evergreen/run-tests-serverless.sh
+++ b/.evergreen/run-tests-serverless.sh
@@ -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
diff --git a/.mod/drivers-evergreen-tools b/.mod/drivers-evergreen-tools
index 6b328a119f..0361b3fd3a 160000
--- a/.mod/drivers-evergreen-tools
+++ b/.mod/drivers-evergreen-tools
@@ -1 +1 @@
-Subproject commit 6b328a119fa0ffdcd13e62b2c1c2259873a9076d
+Subproject commit 0361b3fd3a9f1641518aa2f37d872d3346e8a450

From 38190b836d4521ba70ef97460356e8563a8bacd4 Mon Sep 17 00:00:00 2001
From: Jamis Buck <jamis.buck@mongodb.com>
Date: Wed, 9 Aug 2023 14:38:48 -0600
Subject: [PATCH 2/2] propagate CRYPT_SHARED_LIB_PATH from the
 create-instance.sh script to run-serverless-tests.sh

---
 .evergreen/config.yml            | 2 +-
 .evergreen/config/common.yml.erb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.evergreen/config.yml b/.evergreen/config.yml
index 27a1ab0ed2..499c5fa7d1 100644
--- a/.evergreen/config.yml
+++ b/.evergreen/config.yml
@@ -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"
diff --git a/.evergreen/config/common.yml.erb b/.evergreen/config/common.yml.erb
index 4febb453fa..836a1849f0 100644
--- a/.evergreen/config/common.yml.erb
+++ b/.evergreen/config/common.yml.erb
@@ -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"