test(NODE-6495): make drivers tools a subnodule

Author: durran

.evergreen/config.yml

@@ -13,6 +13,7 @@ functions:
       params:
         directory: src
         shallow_clone: true
+        recurse_submodules: true
     - command: subprocess.exec
       params:
         working_dir: src

.evergreen/docker/Dockerfile.musl

@@ -16,6 +16,6 @@ EOF
 # clone drivers evergreen tools into the same location that it lives on the host machine
 # this ensures any paths configured in variables by drivers-evergreen-tools work
 # in the container too.
-ARG DRIVERS_TOOLS=drivers-evergreen-tools
-WORKDIR ${DRIVERS_TOOLS}
-RUN git clone https://github.com/mongodb-labs/drivers-evergreen-tools.git .
+# ARG DRIVERS_TOOLS=drivers-evergreen-tools
+# WORKDIR ${DRIVERS_TOOLS}
+# RUN git clone https://github.com/mongodb-labs/drivers-evergreen-tools.git .

.evergreen/prepare-mongodb-aws-ecs-auth.sh

@@ -21,7 +21,7 @@ cat $ECS_SRC_DIR/.evergreen/run-mongodb-aws-ecs-test.sh
 
 # tar the file and drivers tools and do the same
 cd ..
-tar -czf src.tgz src drivers-tools
+tar -czf src.tgz src
 mv src.tgz $ECS_SRC_DIR/src.tgz
 
 export MONGODB_BINARIES="${MONGODB_BINARIES}"

.evergreen/prepare-shell.sh

@@ -6,10 +6,9 @@
 
 # This script prepares a shell to run the remaining scripts in this folder
 # It MUST be kept idempotent! It will overwrite the orchestration config and expansion.yml file upon every run
-# and it will only clone drivers-tools if they do not exist one directory above our driver src
 
 PROJECT_DIRECTORY="$(pwd)"
-DRIVERS_TOOLS=$(cd .. && echo "$(pwd)/drivers-tools")
+DRIVERS_TOOLS="$(pwd)/drivers-evergreen-tools"
 MONGO_ORCHESTRATION_HOME="$DRIVERS_TOOLS/.evergreen/orchestration"
 MONGODB_BINARIES="$DRIVERS_TOOLS/mongodb/bin"
 UPLOAD_BUCKET="${project}"
@@ -30,12 +29,11 @@ export MONGODB_BINARIES
 export TMPDIR="$MONGO_ORCHESTRATION_HOME/db"
 export PATH="$MONGODB_BINARIES:$PATH"
 
-if [ ! -d "$DRIVERS_TOOLS" ]; then
-  # Only clone driver tools if it does not exist
-  git clone --depth=1 "https://github.com/mongodb-labs/drivers-evergreen-tools.git" "${DRIVERS_TOOLS}"
-fi
+# Note the evergreen option on git.get_project recurse_submodules does not work, so do it here.
+git submodule init
+git submodule update
 
-echo "installed DRIVERS_TOOLS from commit $(git -C "${DRIVERS_TOOLS}" rev-parse HEAD)"
+ls -la $DRIVERS_TOOLS
 
 cat <<EOT > "$MONGO_ORCHESTRATION_HOME/orchestration.config"
 {

.evergreen/run-deployed-azure-kms-tests.sh

@@ -11,7 +11,7 @@ export AZUREKMS_PUBLICKEYPATH=/tmp/testazurekms_publickey
 export AZUREKMS_PRIVATEKEYPATH=/tmp/testazurekms_privatekey
 
 echo "compressing node driver source and tools ... begin"
-tar -czf node-driver-source.tgz src drivers-tools
+tar -czf node-driver-source.tgz src
 echo "compressing node driver source and tools ... end"
 
 export AZUREKMS_SRC=node-driver-source.tgz

.evergreen/run-mongodb-aws-ecs-test.sh

@@ -5,7 +5,7 @@ set -o errexit  # Exit the script with error if any of the commands fail
 export MONGODB_URI="$1"
 
 tar -xzf src/src.tgz
-# produces src/ and drivers-tools/
+# produces src/
 
 cd src
 

.evergreen/run-oidc-tests-azure.sh

@@ -4,7 +4,7 @@ set -o errexit  # Exit the script with error if any of the commands fail
 
 export AZUREOIDC_DRIVERS_TAR_FILE=/tmp/node-mongodb-native.tgz
 cd ..
-tar -czf $AZUREOIDC_DRIVERS_TAR_FILE src drivers-tools
+tar -czf $AZUREOIDC_DRIVERS_TAR_FILE src
 cd -
 export AZUREOIDC_TEST_CMD="source ./env.sh && cd src && ENVIRONMENT=azure ./.evergreen/${SCRIPT}"
 export PROJECT_DIRECTORY=$PROJECT_DIRECTORY

.evergreen/run-oidc-tests-gcp.sh

@@ -4,7 +4,7 @@ set -o errexit  # Exit the script with error if any of the commands fail
 
 export GCPOIDC_DRIVERS_TAR_FILE=/tmp/node-mongodb-native.tgz
 cd ..
-tar -czf $GCPOIDC_DRIVERS_TAR_FILE src drivers-tools
+tar -czf $GCPOIDC_DRIVERS_TAR_FILE src
 cd -
 export GCPOIDC_TEST_CMD="source ./secrets-export.sh drivers/gcpoidc && cd src && ENVIRONMENT=gcp ./.evergreen/${SCRIPT}"
 export PROJECT_DIRECTORY=$PROJECT_DIRECTORY

.evergreen/run-oidc-tests-k8s.sh

@@ -4,7 +4,7 @@ set -o errexit  # Exit the script with error if any of the commands fail
 
 export K8S_DRIVERS_TAR_FILE=/tmp/node-mongodb-native.tgz
 cd ..
-tar -czf $K8S_DRIVERS_TAR_FILE src drivers-tools
+tar -czf $K8S_DRIVERS_TAR_FILE src
 cd -
 bash $DRIVERS_TOOLS/.evergreen/auth_oidc/k8s/setup-pod.sh
 bash $DRIVERS_TOOLS/.evergreen/auth_oidc/k8s/run-self-test.sh

.github/dependabot.yml

@@ -5,6 +5,10 @@
 
 version: 2
 updates:
+  - package-ecosystem: "gitsubmodule" # See documentation for possible values
+    directory: "/"
+    schedule:
+      interval: "daily"
   - package-ecosystem: "github-actions" # See documentation for possible values
     directory: "/" # Location of package manifests
     schedule:

.gitmodules

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