Merge v1.x into v2.x

.evergreen/config/functions.yml

@@ -4,7 +4,7 @@ functions:
     - command: git.get_project
       params:
         directory: "src"
-    # Make an evergreen exapanstion file with dynamic values
+    # Make an evergreen expansion file with dynamic values
     - command: shell.exec
       params:
         working_dir: "src"
@@ -16,7 +16,7 @@ functions:
              CURRENT_VERSION=latest
           fi
 
-          export DRIVERS_TOOLS="$(pwd)/../drivers-tools"
+          export DRIVERS_TOOLS="$(pwd)/tests/drivers-evergreen-tools"
           export PROJECT_DIRECTORY="$(pwd)"
 
           # Python has cygwin path problems on Windows. Detect prospective mongo-orchestration home directory
@@ -111,15 +111,10 @@ functions:
   "prepare resources":
     - command: shell.exec
       params:
+        working_dir: src
         script: |
           ${PREPARE_SHELL}
-          rm -rf $DRIVERS_TOOLS
-          if [ "${project}" = "drivers-tools" ]; then
-            # If this was a patch build, doing a fresh clone would not actually test the patch
-            cp -R ${PROJECT_DIRECTORY}/ $DRIVERS_TOOLS
-          else
-            git clone https://github.com/mongodb-labs/drivers-evergreen-tools.git --depth 1 $DRIVERS_TOOLS
-          fi
+          git submodule update --init
           echo "{ \"releases\": { \"default\": \"$MONGODB_BINARIES\" }}" > $MONGO_ORCHESTRATION_HOME/orchestration.config
 
   "upload test results":

.github/workflows/tests.yml

@@ -66,13 +66,14 @@ jobs:
         with:
           python-version: '3.13'
 
-      - id: setup-mongodb
-        uses: mongodb-labs/drivers-evergreen-tools@master
+      - name: "Setup MongoDB"
+        id: setup-mongodb
+        uses: ./tests/drivers-evergreen-tools
         with:
           version: ${{ matrix.mongodb-version }}
           topology: ${{ matrix.topology }}
 
-      - name: "Setup"
+      - name: "Setup PHP"
         uses: "./.github/actions/setup"
         with:
           php-version: ${{ matrix.php-version }}

.gitmodules

@@ -1,3 +1,6 @@
+[submodule "drivers-evergreen-tools"]
+	path = tests/drivers-evergreen-tools
+	url = https://github.com/mongodb-labs/drivers-evergreen-tools
 [submodule "specifications"]
 	path = tests/specifications
 	url = https://github.com/mongodb/specifications