Cleanup

Author: NoahStapp

.evergreen/config.yml

@@ -85,6 +85,7 @@ functions:
         working_dir: "src"
         include_expansions_in_env: ["AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY", "AWS_SESSION_TOKEN"]
         args:
+          - .evergreen/scripts/run-with-env.sh
           - .evergreen/scripts/download-and-merge-coverage.sh
           - ${bucket_name}
           - ${revision}
@@ -295,7 +296,7 @@ functions:
   "run tests":
     - command: subprocess.exec
       params:
-        include_expansions_in_env: ["TEST_DATA_LAKE", "TEST_INDEX_MANAGEMENT", "CRYPT_SHARED_LIB_PATH", "test_encryption", "test_encryption_pyopenssl", "test_crypt_shared", "test_pyopenssl", "test_loadbalancer", "test_serverless", "ORCHESTRATION_FILE", "SINGLE_MONGOS_LB_URI", "MULTI_MONGOS_LB_URI"]
+        include_expansions_in_env: ["TEST_DATA_LAKE", "TEST_INDEX_MANAGEMENT", "CRYPT_SHARED_LIB_PATH", "test_encryption", "test_encryption_pyopenssl", "test_crypt_shared", "test_pyopenssl", "test_loadbalancer", "test_serverless", "ORCHESTRATION_FILE"]
         binary: bash
         working_dir: "src"
         args:
@@ -313,7 +314,7 @@ functions:
       params:
         working_dir: "src"
         binary: bash
-        include_expansions_in_env: ["AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY", "AWS_SESSION_TOKEN", "TEST_DATA_LAKE", "TEST_INDEX_MANAGEMENT", "CRYPT_SHARED_LIB_PATH"]
+        include_expansions_in_env: ["AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY", "AWS_SESSION_TOKEN", "TEST_DATA_LAKE", "TEST_INDEX_MANAGEMENT", "CRYPT_SHARED_LIB_PATH", "SINGLE_MONGOS_LB_URI", "MULTI_MONGOS_LB_URI"]
         args:
           - .evergreen/scripts/run-with-env.sh
           - .evergreen/scripts/run-tests.sh

.evergreen/scripts/download-and-merge-coverage.sh

@@ -1,6 +1,5 @@
 #!/bin/bash
 
 set +x
-. src/.evergreen/scripts/env.sh
 # Download all the task coverage files.
 aws s3 cp --recursive s3://"$1"/coverage/"$2"/"$3"/coverage/ coverage/

.evergreen/scripts/run-tests.sh

@@ -1,9 +1,5 @@
 #!/bin/bash
 
-if [ -n "${test_encryption}" ]; then
-  ./.evergreen/hatch.sh encryption:setup &
-fi
-
 set +x
 if [ -n "${MONGODB_STARTED}" ]; then
   export PYMONGO_MUST_CONNECT=true