fixups

Author: blink1073

.evergreen/run-tests.sh

@@ -23,9 +23,9 @@ else
   echo "Missing test inputs, please run 'just setup-test'"
 fi
 
-# Source the csfle secrets if running encryption test.
-if [ -n "${TEST_ENCRYPTION:-}" ]; then
-  source $DRIVERS_TOOLS/.evergreen/csfle/secrets-export.sh
+# Source the local secrets export file if available.
+if [ -f "$ROOT_DIR/secrets-export.sh" ]; then
+  source "$ROOT_DIR/secrets-export.sh"
 fi
 
 PYTHON_IMPL=$(uv run python -c "import platform; print(platform.python_implementation())")

.evergreen/scripts/run-enterprise-auth-tests.sh

@@ -5,4 +5,5 @@ set -eu
 set +x
 # Use the default python to bootstrap secrets.
 bash "${DRIVERS_TOOLS}"/.evergreen/secrets_handling/setup-secrets.sh drivers/enterprise_auth
-TEST_ENTERPRISE_AUTH=1 AUTH=auth bash "${PROJECT_DIRECTORY}"/.evergreen/just.sh test-eg
+TEST_ENTERPRISE_AUTH=1 AUTH=auth bash "${PROJECT_DIRECTORY}"/.evergreen/just.sh setup-test
+bash "${PROJECT_DIRECTORY}"/.evergreen/just.sh test-eg

.evergreen/scripts/setup-tests.py

@@ -191,10 +191,14 @@ def handle_test_env() -> None:
             MULTI_MONGOS_LB_URI += "&tls=true"
         write_env("SINGLE_MONGOS_LB_URI", SINGLE_MONGOS_LB_URI)
         write_env("MULTI_MONGOS_LB_URI", MULTI_MONGOS_LB_URI)
+        if not DRIVERS_TOOLS:
+            raise RuntimeError("Missing DRIVERS_TOOLS")
         cmd = f'bash "{DRIVERS_TOOLS}/.evergreen/run-load-balancer.sh" start'
         run_command(cmd)
 
     if SSL != "nossl":
+        if not DRIVERS_TOOLS:
+            raise RuntimeError("Missing DRIVERS_TOOLS")
         write_env("CLIENT_PEM", f"{DRIVERS_TOOLS}/.evergreen/x509gen/client.pem")
         write_env("CA_PEM", f"{DRIVERS_TOOLS}/.evergreen/x509gen/ca.pem")
 
@@ -231,6 +235,8 @@ def handle_test_env() -> None:
         # PATH is updated by configure-env.sh for access to mongocryptd.
 
     if is_set("TEST_ENCRYPTION"):
+        if not DRIVERS_TOOLS:
+            raise RuntimeError("Missing DRIVERS_TOOLS")
         run_command(f"bash {DRIVERS_TOOLS}/.evergreen/csfle/setup-secrets.sh")
         run_command(f"bash {DRIVERS_TOOLS}/.evergreen/csfle/start-servers.sh")
 

.evergreen/scripts/setup-tests.sh

@@ -32,8 +32,8 @@ SCRIPT_DIR=$(dirname ${BASH_SOURCE:-$0})
 ROOT_DIR="$(dirname $(dirname $SCRIPT_DIR))"
 
 # Try to source the env file.
-if [ -f $SCRIPT_DIR/scripts/env.sh ]; then
-  source $SCRIPT_DIR/scripts/env.sh
+if [ -f $SCRIPT_DIR/env.sh ]; then
+  source $SCRIPT_DIR/env.sh
 fi
 
 # Source serverless secrets if applicable.