PYTHON-5151 Convert kms tests to use python scripts

.evergreen/config.yml

@@ -265,13 +265,13 @@ functions:
           DISABLE_TEST_COMMANDS, GREEN_FRAMEWORK, NO_EXT, COMPRESSORS, MONGODB_API_VERSION]
         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-mongodb-aws-ecs-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-mongodb-oidc-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-perf-tests.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-tests.sh

@@ -20,7 +20,7 @@ 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
 

.evergreen/scripts/bootstrap-mongo-orchestration.sh

@@ -34,10 +34,10 @@ if [ -z "${TEST_CRYPT_SHARED:-}" ]; then
     export SKIP_CRYPT_SHARED=1
 fi
 
-MONGODB_VERSION=${VERSION} \
-    TOPOLOGY=${TOPOLOGY} \
-    AUTH=${AUTH:-noauth} \
-    SSL=${SSL:-nossl} \
+MONGODB_VERSION=${VERSION:-} \
+    TOPOLOGY=${TOPOLOGY:-} \
+    AUTH=${AUTH:-} \
+    SSL=${SSL:-} \
     STORAGE_ENGINE=${STORAGE_ENGINE:-} \
     DISABLE_TEST_COMMANDS=${DISABLE_TEST_COMMANDS:-} \
     ORCHESTRATION_FILE=${ORCHESTRATION_FILE:-} \

.evergreen/scripts/cleanup.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

.evergreen/scripts/generate_config.py

@@ -835,6 +835,25 @@ def create_load_balancer_tasks():
     return tasks
 
 
+def create_kms_tasks():
+    tasks = []
+    for kms_type in ["gcp", "azure"]:
+        for success in [True, False]:
+            name = f"test-{kms_type}kms"
+            sub_test_name = kms_type
+            if not success:
+                name += "-fail"
+                sub_test_name += "-fail"
+            commands = []
+            if not success:
+                commands.append(FunctionCall(func="bootstrap mongo-orchestration"))
+            test_vars = dict(TEST_NAME="kms", SUB_TEST_NAME=sub_test_name)
+            test_func = FunctionCall(func="run tests", vars=test_vars)
+            commands.append(test_func)
+            tasks.append(EvgTask(name=name, commands=commands))
+    return tasks
+
+
 ##################
 # Generate Config
 ##################