mockupdb, doctests, atlas

Author: NoahStapp

.evergreen/config.yml

@@ -87,7 +87,7 @@ functions:
         working_dir: "src"
         include_expansions_in_env: ["AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY", "AWS_SESSION_TOKEN"]
         args:
-          - src/.evergreen/scripts/download_and_merge_coverage.sh ${bucket_name} ${revision} ${version_id}
+          - src/.evergreen/scripts/download-and-merge-coverage.sh ${bucket_name} ${revision} ${version_id}
     - command: subprocess.exec
       params:
         working_dir: "src"
@@ -267,25 +267,22 @@ functions:
             bash ${PROJECT_DIRECTORY}/.evergreen/run-mod-wsgi-tests.sh
 
   "run mockupdb tests":
-    - command: shell.exec
+    - command: subprocess.exec
       type: test
       params:
         working_dir: "src"
-        script: |
-          . .evergreen/scripts/env.sh
-          set -o xtrace
-          export PYTHON_BINARY=${PYTHON_BINARY}
-          bash ${PROJECT_DIRECTORY}/.evergreen/hatch.sh test:test-mockupdb
+        binary: bash
+        args:
+          - .evergreen/scripts/run-mockupdb-tests.sh
 
   "run doctests":
-     - command: shell.exec
+     - command: subprocess.exec
        type: test
        params:
          working_dir: "src"
-         script: |
-           . .evergreen/scripts/env.sh
-           set -o xtrace
-           PYTHON_BINARY=${PYTHON_BINARY} bash ${PROJECT_DIRECTORY}/.evergreen/hatch.sh doctest:test
+         binary: bash
+         args:
+          - .evergreen/scripts/run-doctests.sh
 
   "run tests":
     - command: shell.exec
@@ -379,20 +376,14 @@ functions:
             bash ${PROJECT_DIRECTORY}/.evergreen/hatch.sh test:test-eg
 
   "run atlas tests":
-    - command: shell.exec
+    - command: subprocess.exec
       type: test
       params:
-        include_expansions_in_env: ["DRIVERS_TOOLS", "AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY", "AWS_SESSION_TOKEN"]
+        binary: bash
+        include_expansions_in_env: ["DRIVERS_TOOLS", "PROJECT_DIRECTORY", "PYTHON_BINARY", "AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY", "AWS_SESSION_TOKEN"]
         working_dir: "src"
-        script: |
-          # Disable xtrace for security reasons (just in case it was accidentally set).
-          set +x
-          set -o errexit
-          bash ${DRIVERS_TOOLS}/.evergreen/auth_aws/setup_secrets.sh drivers/atlas_connect
-          PROJECT_DIRECTORY="${PROJECT_DIRECTORY}" \
-            PYTHON_BINARY="${PYTHON_BINARY}" \
-            TEST_ATLAS=1 \
-            bash ${PROJECT_DIRECTORY}/.evergreen/hatch.sh test:test-eg
+        args:
+          - .evergreen/scripts/run-atlas-tests.sh
 
   "get aws auth secrets":
     - command: subprocess.exec

.evergreen/scripts/archive-mongodb-logs.sh

@@ -1,8 +1,8 @@
-#!bin/bash
+#!/bin/bash
 
-. src/.evergreen/scripts/env.sh
+. .evergreen/scripts/env.sh
 set -o xtrace
 mkdir out_dir
-find $MONGO_ORCHESTRATION_HOME -name \*.log -exec sh -c 'x="{}"; mv $x $PWD/out_dir/$(basename $(dirname $x))_$(basename $x)' \;
+find "$MONGO_ORCHESTRATION_HOME" -name \*.log -exec sh -c 'x="{}"; mv $x $PWD/out_dir/$(basename $(dirname $x))_$(basename $x)' \;
 tar zcvf mongodb-logs.tar.gz -C out_dir/ .
 rm -rf out_dir

.evergreen/scripts/boostrap-mongo-orchestration.sh renamed to .evergreen/scripts/bootstrap-mongo-orchestration.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+# Disable xtrace for security reasons (just in case it was accidentally set).
+set +x
+set -o errexit
+bash "${DRIVERS_TOOLS}"/.evergreen/auth_aws/setup_secrets.sh drivers/atlas_connect
+TEST_ATLAS=1 bash "${PROJECT_DIRECTORY}"/.evergreen/hatch.sh test:test-eg

.evergreen/scripts/download_and_merge_coverage.sh renamed to .evergreen/scripts/download-and-merge-coverage.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+. .evergreen/scripts/env.sh
+set -o xtrace
+PYTHON_BINARY=${PYTHON_BINARY} bash ${PROJECT_DIRECTORY}/.evergreen/hatch.sh doctest:test

.evergreen/scripts/run-atlas-tests.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+. .evergreen/scripts/env.sh
+set -o xtrace
+export PYTHON_BINARY=${PYTHON_BINARY}
+bash ${PROJECT_DIRECTORY}/.evergreen/hatch.sh test:test-mockupdb