Merge branch 'master' into PYTHON-4493-prod

Author: NoahStapp

.evergreen/config.yml

@@ -262,16 +262,16 @@ functions:
       params:
         include_expansions_in_env: [AUTH, SSL, AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY,
           AWS_SESSION_TOKEN, COVERAGE, PYTHON_BINARY, LIBMONGOCRYPT_URL, MONGODB_URI,
-          DISABLE_TEST_COMMANDS, GREEN_FRAMEWORK, NO_EXT, COMPRESSORS]
+          DISABLE_TEST_COMMANDS, GREEN_FRAMEWORK, NO_EXT, COMPRESSORS, MONGODB_API_VERSION, DEBUG_LOG]
         binary: bash
         working_dir: "src"
-        args: [.evergreen/just.sh, setup-test, "${TEST_NAME}", "${SUB_TEST_NAME}"]
+        args: [.evergreen/just.sh, setup-tests, "${TEST_NAME}", "${SUB_TEST_NAME}"]
     - command: subprocess.exec
       type: test
       params:
         working_dir: "src"
         binary: bash
-        args: [.evergreen/just.sh, test-eg]
+        args: [.evergreen/just.sh, run-tests]
 
   "run enterprise auth tests":
     - command: subprocess.exec
@@ -443,13 +443,12 @@ functions:
         binary: bash
         working_dir: "src"
         args:
-          - ${DRIVERS_TOOLS}/.evergreen/csfle/teardown.sh
+          - ${DRIVERS_TOOLS}/.evergreen/ocsp/teardown.sh
     - command: subprocess.exec
       params:
-        binary: bash
-        working_dir: "src"
-        args:
-          - ${DRIVERS_TOOLS}/.evergreen/ocsp/teardown.sh
+          binary: bash
+          working_dir: "src"
+          args: [.evergreen/just.sh, teardown-tests]
     - command: subprocess.exec
       params:
         binary: bash
@@ -562,51 +561,6 @@ task_groups:
     tasks:
       - ".serverless"
 
-  - name: testgcpkms_task_group
-    setup_group_can_fail_task: true
-    setup_group_timeout_secs: 1800 # 30 minutes
-    setup_group:
-      - func: fetch source
-      - func: setup system
-      - command: subprocess.exec
-        params:
-          binary: bash
-          args:
-            - ${DRIVERS_TOOLS}/.evergreen/csfle/gcpkms/create-and-setup-instance.sh
-    teardown_task:
-      - command: subprocess.exec
-        params:
-          binary: bash
-          args:
-            - ${DRIVERS_TOOLS}/.evergreen/csfle/gcpkms/delete-instance.sh
-      - func: "upload test results"
-    tasks:
-      - testgcpkms-task
-
-  - name: testazurekms_task_group
-    setup_group:
-      - func: fetch source
-      - func: setup system
-      - command: subprocess.exec
-        params:
-          binary: bash
-          env:
-            AZUREKMS_VMNAME_PREFIX: "PYTHON_DRIVER"
-          args:
-            - ${DRIVERS_TOOLS}/.evergreen/csfle/azurekms/create-and-setup-vm.sh
-    teardown_group:
-      - command: subprocess.exec
-        params:
-          binary: bash
-          args:
-            - ${DRIVERS_TOOLS}/.evergreen/csfle/azurekms/delete-vm.sh
-      - func: "upload test results"
-    setup_group_can_fail_task: true
-    teardown_task_can_fail_task: true
-    setup_group_timeout_secs: 1800
-    tasks:
-    - testazurekms-task
-
   - name: testazureoidc_task_group
     setup_group:
       - func: fetch source
@@ -1395,60 +1349,6 @@ tasks:
       commands:
         - func: "download and merge coverage"
 
-    - name: "testgcpkms-task"
-      commands:
-        - command: subprocess.exec
-          type: test
-          params:
-            working_dir: "src"
-            binary: bash
-            include_expansions_in_env: ["DRIVERS_TOOLS"]
-            args:
-              - .evergreen/run-gcpkms-test.sh
-
-    - name: "testgcpkms-fail-task"
-      # testgcpkms-fail-task runs in a non-GCE environment.
-      # It is expected to fail to obtain GCE credentials.
-      commands:
-        - func: "bootstrap mongo-orchestration"
-          vars:
-            VERSION: "latest"
-            TOPOLOGY: "server"
-        - command: subprocess.exec
-          type: test
-          params:
-            include_expansions_in_env: ["PYTHON_BINARY"]
-            working_dir: "src"
-            binary: "bash"
-            args:
-              - .evergreen/scripts/run-gcpkms-fail-test.sh
-
-    - name: testazurekms-task
-      commands:
-      - command: subprocess.exec
-        type: test
-        params:
-          binary: bash
-          working_dir: src
-          include_expansions_in_env: ["DRIVERS_TOOLS"]
-          args:
-            - .evergreen/run-azurekms-test.sh
-
-    - name: testazurekms-fail-task
-      commands:
-      - func: "bootstrap mongo-orchestration"
-        vars:
-          VERSION: "latest"
-          TOPOLOGY: "server"
-      - command: subprocess.exec
-        type: test
-        params:
-          binary: bash
-          working_dir: src
-          include_expansions_in_env: ["DRIVERS_TOOLS"]
-          args:
-            - .evergreen/run-azurekms-fail-test.sh
-
     - name: "perf-6.0-standalone"
       tags: ["perf"]
       commands:
@@ -1529,12 +1429,12 @@ buildvariants:
   run_on:
     - debian11-small
   tasks:
-    - name: testgcpkms_task_group
+    - name: test-gcpkms
       batchtime: 20160 # Use a batchtime of 14 days as suggested by the CSFLE test README
-    - testgcpkms-fail-task
-    - name: testazurekms_task_group
+    - name: test-gcpkms-fail
+    - name: test-azurekms
       batchtime: 20160 # Use a batchtime of 14 days as suggested by the CSFLE test README
-    - testazurekms-fail-task
+    - name: test-azurekms-fail
 
 - name: rhel8-test-lambda
   display_name: FaaS Lambda

.evergreen/generated_configs/tasks.yml

@@ -1,4 +1,32 @@
 tasks:
+  # Kms tests
+  - name: test-gcpkms
+    commands:
+      - func: run tests
+        vars:
+          TEST_NAME: kms
+          SUB_TEST_NAME: gcp
+  - name: test-gcpkms-fail
+    commands:
+      - func: bootstrap mongo-orchestration
+      - func: run tests
+        vars:
+          TEST_NAME: kms
+          SUB_TEST_NAME: gcp-fail
+  - name: test-azurekms
+    commands:
+      - func: run tests
+        vars:
+          TEST_NAME: kms
+          SUB_TEST_NAME: azure
+  - name: test-azurekms-fail
+    commands:
+      - func: bootstrap mongo-orchestration
+      - func: run tests
+        vars:
+          TEST_NAME: kms
+          SUB_TEST_NAME: azure-fail
+
   # Load balancer tests
   - name: test-load-balancer-auth-ssl
     commands:

.evergreen/run-azurekms-fail-test.sh

@@ -30,5 +30,5 @@ export SET_XTRACE_ON=1
 cd src
 rm -rf .venv
 rm -f .evergreen/scripts/test-env.sh || true
-bash ./.evergreen/just.sh setup-test auth_aws ecs
-bash .evergreen/just.sh test-eg
+bash ./.evergreen/just.sh setup-tests auth_aws ecs
+bash .evergreen/just.sh run-tests

.evergreen/run-azurekms-test.sh

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

.evergreen/run-gcpkms-test.sh

@@ -15,5 +15,5 @@ export OUTPUT_FILE="${PROJECT_DIRECTORY}/results.json"
 
 export PYTHON_BINARY=/opt/mongodbtoolchain/v4/bin/python3
 
-bash ./.evergreen/just.sh setup-test perf
-bash ./.evergreen/just.sh test-eg
+bash ./.evergreen/just.sh setup-tests perf
+bash ./.evergreen/just.sh run-tests

.evergreen/run-mongodb-aws-ecs-test.sh

@@ -1,16 +1,12 @@
 #!/bin/bash
-set -eux
+set -eu
 
 SCRIPT_DIR=$(dirname ${BASH_SOURCE:-$0})
 SCRIPT_DIR="$( cd -- "$SCRIPT_DIR" > /dev/null 2>&1 && pwd )"
 ROOT_DIR="$(dirname $SCRIPT_DIR)"
 
 pushd $ROOT_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
-
 # Try to source the env file.
 if [ -f $SCRIPT_DIR/scripts/env.sh ]; then
   echo "Sourcing env inputs"
@@ -24,75 +20,19 @@ 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 "./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 "${TEST_PERF:-}" ]; then
-    start_time=$(date +%s)
-fi
-
-# 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 "${TEST_PERF:-}" ]; 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
+# Start the test runner.
+uv run ${UV_ARGS} .evergreen/scripts/run_tests.py "$@"
 
 popd