Merge branch 'master' into PYTHON-5113

Author: NoahStapp

Diff for: .evergreen/config.yml

@@ -26,10 +26,9 @@ apt-get -qq update  < /dev/null > /dev/null
 apt-get -qq install $PYTHON_VER $PYTHON_VER-venv build-essential $PYTHON_VER-dev -y  < /dev/null > /dev/null
 
 export PYTHON_BINARY=$PYTHON_VER
-export TEST_AUTH_AWS=1
-export AUTH="auth"
 export SET_XTRACE_ON=1
 cd src
 rm -rf .venv
-bash ./.evergreen/just.sh setup-test
-bash .evergreen/just.sh test-eg
+rm -f .evergreen/scripts/test-env.sh || true
+bash ./.evergreen/just.sh setup-tests auth_aws ecs-remote
+bash .evergreen/just.sh run-tests

Diff for: .evergreen/generated_configs/tasks.yml

@@ -29,5 +29,5 @@ else
     exit 1
 fi
 
-TEST_AUTH_OIDC=1 COVERAGE=1 AUTH="auth" bash ./.evergreen/just.sh setup-test
-bash ./.evergreen/just.sh test-eg "${@:1}"
+COVERAGE=1 bash ./.evergreen/just.sh setup-tests auth_oidc
+bash ./.evergreen/just.sh run-tests "${@:1}"

Diff for: .evergreen/generated_configs/variants.yml

@@ -14,7 +14,6 @@ export TEST_PATH="${PROJECT_DIRECTORY}/specifications/source/benchmarking/data"
 export OUTPUT_FILE="${PROJECT_DIRECTORY}/results.json"
 
 export PYTHON_BINARY=/opt/mongodbtoolchain/v4/bin/python3
-export PERF_TEST=1
 
-bash ./.evergreen/just.sh setup-test
-bash ./.evergreen/just.sh test-eg
+bash ./.evergreen/just.sh setup-tests perf
+bash ./.evergreen/just.sh run-tests

Diff for: .evergreen/run-azurekms-fail-test.sh

@@ -2,11 +2,10 @@
 set -eu
 
 SCRIPT_DIR=$(dirname ${BASH_SOURCE:-$0})
-ROOT_DIR="$(dirname "$(dirname $SCRIPT_DIR)")"
+SCRIPT_DIR="$( cd -- "$SCRIPT_DIR" > /dev/null 2>&1 && pwd )"
+ROOT_DIR="$(dirname $SCRIPT_DIR)"
 
-export PIP_QUIET=1  # Quiet by default
-export PIP_PREFER_BINARY=1 # Prefer binary dists by default
-export UV_FROZEN=1  # Do not modify lock files
+pushd $ROOT_DIR
 
 # Try to source the env file.
 if [ -f $SCRIPT_DIR/scripts/env.sh ]; then
@@ -16,77 +15,24 @@ else
   echo "Not sourcing env inputs"
 fi
 
-# Ensure there are test inputs.
+# Handle test inputs.
 if [ -f $SCRIPT_DIR/scripts/test-env.sh ]; then
   echo "Sourcing test inputs"
   . $SCRIPT_DIR/scripts/test-env.sh
 else
-  echo "Missing test inputs, please run 'just setup-test'"
+  echo "Missing test inputs, please run 'just setup-tests'"
+  exit 1
 fi
 
 # Source the local secrets export file if available.
-if [ -f "$ROOT_DIR/secrets-export.sh" ]; then
-  . "$ROOT_DIR/secrets-export.sh"
+if [ -f "./secrets-export.sh" ]; then
+  . "./secrets-export.sh"
 fi
 
-PYTHON_IMPL=$(uv run python -c "import platform; print(platform.python_implementation())")
-
-# Ensure C extensions if applicable.
-if [ -z "${NO_EXT:-}" ] && [ "$PYTHON_IMPL" = "CPython" ]; then
-    uv run --frozen tools/fail_if_no_c.py
-fi
-
-if [ -n "${PYMONGOCRYPT_LIB:-}" ]; then
-    # Ensure pymongocrypt is working properly.
-    # shellcheck disable=SC2048
-    uv run ${UV_ARGS} python -c "import pymongocrypt; print('pymongocrypt version: '+pymongocrypt.__version__)"
-    # shellcheck disable=SC2048
-    uv run ${UV_ARGS} python -c "import pymongocrypt; print('libmongocrypt version: '+pymongocrypt.libmongocrypt_version())"
-    # PATH is updated by configure-env.sh for access to mongocryptd.
-fi
-
-PYTHON_IMPL=$(uv run python -c "import platform; print(platform.python_implementation())")
-echo "Running ${AUTH:-noauth} tests over ${SSL:-nossl} with python $(uv python find)"
-uv run python -c 'import sys; print(sys.version)'
-
-# Show the installed packages
-# shellcheck disable=SC2048
+# List the packages.
 PIP_QUIET=0 uv run ${UV_ARGS} --with pip pip list
 
-# Record the start time for a perf test.
-if [ -n "${PERF_TEST:-}" ]; then
-    start_time=$(date +%s)
-fi
+# Start the test runner.
+uv run ${UV_ARGS} .evergreen/scripts/run_tests.py "$@"
 
-# Run the tests, and store the results in Evergreen compatible XUnit XML
-# files in the xunit-results/ directory.
-TEST_ARGS=${TEST_ARGS}
-if [ "$#" -ne 0 ]; then
-    TEST_ARGS="$*"
-fi
-echo "Running tests with $TEST_ARGS and uv args $UV_ARGS..."
-if [ -z "${GREEN_FRAMEWORK:-}" ]; then
-    # shellcheck disable=SC2048
-    uv run ${UV_ARGS} pytest $TEST_ARGS
-else
-    # shellcheck disable=SC2048
-    uv run ${UV_ARGS} green_framework_test.py $GREEN_FRAMEWORK -v $TEST_ARGS
-fi
-echo "Running tests with $TEST_ARGS... done."
-
-# Handle perf test post actions.
-if [ -n "${PERF_TEST:-}" ]; then
-    end_time=$(date +%s)
-    elapsed_secs=$((end_time-start_time))
-
-    cat results.json
-
-    echo "{\"failures\": 0, \"results\": [{\"status\": \"pass\", \"exit_code\": 0, \"test_file\": \"BenchMarkTests\", \"start\": $start_time, \"end\": $end_time, \"elapsed\": $elapsed_secs}]}" > report.json
-
-    cat report.json
-fi
-
-# Handle coverage post actions.
-if [ -n "${COVERAGE:-}" ]; then
-    rm -rf .pytest_cache
-fi
+popd

Diff for: .evergreen/run-azurekms-test.sh

@@ -1,7 +1,4 @@
 #!/bin/bash
 
-if [ -f "$DRIVERS_TOOLS"/.evergreen/csfle/secrets-export.sh ]; then
-  bash .evergreen/teardown-encryption.sh
-fi
 rm -rf "${DRIVERS_TOOLS}" || true
 rm -f ./secrets-export.sh || true

Diff for: .evergreen/run-gcpkms-test.sh

@@ -55,24 +55,11 @@ export MONGODB_BINARIES="$DRIVERS_TOOLS/mongodb/bin"
 cat <<EOT > "$SCRIPT_DIR"/env.sh
 export PROJECT_DIRECTORY="$PROJECT_DIRECTORY"
 export CURRENT_VERSION="$CURRENT_VERSION"
-export SKIP_LEGACY_SHELL=1
 export DRIVERS_TOOLS="$DRIVERS_TOOLS"
 export MONGO_ORCHESTRATION_HOME="$MONGO_ORCHESTRATION_HOME"
 export MONGODB_BINARIES="$MONGODB_BINARIES"
 export DRIVERS_TOOLS_BINARIES="$DRIVERS_TOOLS_BINARIES"
 export PROJECT_DIRECTORY="$PROJECT_DIRECTORY"
-export SETDEFAULTENCODING="${SETDEFAULTENCODING:-}"
-export SKIP_CSOT_TESTS="${SKIP_CSOT_TESTS:-}"
-export MONGODB_STARTED="${MONGODB_STARTED:-}"
-export DISABLE_TEST_COMMANDS="${DISABLE_TEST_COMMANDS:-}"
-export GREEN_FRAMEWORK="${GREEN_FRAMEWORK:-}"
-export NO_EXT="${NO_EXT:-}"
-export COVERAGE="${COVERAGE:-}"
-export COMPRESSORS="${COMPRESSORS:-}"
-export MONGODB_API_VERSION="${MONGODB_API_VERSION:-}"
-export skip_crypt_shared="${skip_crypt_shared:-}"
-export STORAGE_ENGINE="${STORAGE_ENGINE:-}"
-export REQUIRE_API_VERSION="${REQUIRE_API_VERSION:-}"
 export skip_web_identity_auth_test="${skip_web_identity_auth_test:-}"
 export skip_ECS_auth_test="${skip_ECS_auth_test:-}"
 
@@ -89,21 +76,17 @@ EOT
 
 # Write the .env file for drivers-tools.
 rm -rf $DRIVERS_TOOLS
-git clone https://github.com/mongodb-labs/drivers-evergreen-tools.git $DRIVERS_TOOLS
+BRANCH=master
+ORG=mongodb-labs
+git clone --branch $BRANCH https://github.com/$ORG/drivers-evergreen-tools.git $DRIVERS_TOOLS
 
 cat <<EOT > ${DRIVERS_TOOLS}/.env
 SKIP_LEGACY_SHELL=1
 DRIVERS_TOOLS="$DRIVERS_TOOLS"
 MONGO_ORCHESTRATION_HOME="$MONGO_ORCHESTRATION_HOME"
 MONGODB_BINARIES="$MONGODB_BINARIES"
-TMPDIR="$MONGO_ORCHESTRATION_HOME/db"
 EOT
 
-# Skip CSOT tests on non-linux platforms.
-if [ "$(uname -s)" != "Linux" ]; then
-    echo "export SKIP_CSOT_TESTS=1" >> $SCRIPT_DIR/env.sh
-fi
-
 # Add these expansions to make it easier to call out tests scripts from the EVG yaml
 cat <<EOT > expansion.yml
 DRIVERS_TOOLS: "$DRIVERS_TOOLS"