Conditionally source setup-secrets.sh from run-tests.sh

Author: jmikola

.evergreen/config/functions.yml

@@ -222,18 +222,6 @@ functions:
           ${PREPARE_SHELL}
           bash ${PROJECT_DIRECTORY}/.evergreen/run-tests.sh
 
-  "run atlas connectivity tests":
-    - command: shell.exec
-      type: test
-      params:
-        working_dir: "src"
-        shell: bash
-        script: |
-          ${PREPARE_SHELL}
-          . ${DRIVERS_TOOLS}/.evergreen/secrets_handling/setup-secrets.sh drivers/atlas_connect
-          TESTS="tests/atlas.phpt" \
-          bash ${PROJECT_DIRECTORY}/.evergreen/run-tests.sh
-
   "cleanup":
     - command: shell.exec
       params:

.evergreen/config/test-tasks.yml

@@ -2,7 +2,15 @@ tasks:
   - name: "test-atlas-connectivity"
     tags: ["atlas", "nodb"]
     commands:
-      - func: "run atlas connectivity tests"
+      # This creates secrets-export.sh, which is later sourced by run-tests.sh
+      - command: shell.exec
+        params:
+          working_dir: "src"
+          script: |
+            bash ${DRIVERS_TOOLS}/.evergreen/secrets_handling/setup-secrets.sh drivers/atlas_connect
+      - func: "run tests"
+        vars:
+          TESTS: "tests/atlas.phpt"
 
   # Test different storage engines
   - name: "test-mongodb-4.0-standalone-inmemory"

.evergreen/run-tests.sh

@@ -39,6 +39,11 @@ else
    echo "crypt_shared library will be loaded from path: $CRYPT_SHARED_LIB_PATH"
 fi
 
+# Conditionally source setup-secrets.sh created by drivers-evergreen-tools
+if [ -f "${PROJECT_DIRECTORY}/secrets-export.sh" ]; then
+    source ${PROJECT_DIRECTORY}/secrets-export.sh
+fi
+
 echo "Running tests with URI: $MONGODB_URI"
 
 # Run the tests, and store the results in a junit result file