Merge branch 'master' into PYTHON-4575

Author: aclark4life

.evergreen/combine-coverage.sh

@@ -3,8 +3,7 @@
 # Coverage combine merges (and removes) all the coverage files and
 # generates a new .coverage file in the current directory.
 
-set -o xtrace   # Write all commands first to stderr
-set -o errexit  # Exit the script with error if any of the commands fail
+set -eu
 
 . .evergreen/utils.sh
 

.evergreen/config.yml

@@ -206,8 +206,8 @@ functions:
       params:
         binary: bash
         working_dir: "src"
-        include_expansions_in_env: [VERSION, TOPOLOGY, AUTH, SSL, ORCHESTRATION_FILE, PYTHON_BINARY,
-          STORAGE_ENGINE, REQUIRE_API_VERSION, DRIVERS_TOOLS, TEST_CRYPT_SHARED, AUTH_AWS, LOAD_BALANCER]
+        include_expansions_in_env: [VERSION, TOPOLOGY, AUTH, SSL, ORCHESTRATION_FILE, PYTHON_BINARY, PYTHON_VERSION,
+          STORAGE_ENGINE, REQUIRE_API_VERSION, DRIVERS_TOOLS, TEST_CRYPT_SHARED, AUTH_AWS, LOAD_BALANCER, LOCAL_ATLAS]
         args: [.evergreen/just.sh, run-server, "${TEST_NAME}"]
     - command: expansions.update
       params:
@@ -227,9 +227,9 @@ functions:
       type: test
       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,
+          AWS_SESSION_TOKEN, COVERAGE, PYTHON_BINARY, LIBMONGOCRYPT_URL, MONGODB_URI, PYTHON_VERSION,
           DISABLE_TEST_COMMANDS, GREEN_FRAMEWORK, NO_EXT, COMPRESSORS, MONGODB_API_VERSION, DEBUG_LOG,
-          ORCHESTRATION_FILE, OCSP_SERVER_TYPE]
+          ORCHESTRATION_FILE, OCSP_SERVER_TYPE, VERSION]
         binary: bash
         working_dir: "src"
         args: [.evergreen/just.sh, setup-tests, "${TEST_NAME}", "${SUB_TEST_NAME}"]
@@ -290,97 +290,3 @@ post:
   - func: "upload mo artifacts"
   - func: "upload test results"
   - func: "cleanup"
-
-tasks:
-    # Wildcard task. Do you need to find out what tools are available and where?
-    # Throw it here, and execute this task on all buildvariants
-    - name: getdata
-      commands:
-        - command: subprocess.exec
-          binary: bash
-          type: test
-          params:
-            args:
-              - src/.evergreen/scripts/run-getdata.sh
-
-    - name: "coverage-report"
-      tags: ["coverage"]
-      depends_on:
-        # BUILD-3165: We can't use "*" (all tasks) and specify "variant".
-        # Instead list out all coverage tasks using tags.
-        - name: ".standalone"
-          variant: ".coverage_tag"
-          # Run the coverage task even if some tasks fail.
-          status: "*"
-          # Run the coverage task even if some tasks are not scheduled in a patch build.
-          patch_optional: true
-        - name: ".replica_set"
-          variant: ".coverage_tag"
-          status: "*"
-          patch_optional: true
-        - name: ".sharded_cluster"
-          variant: ".coverage_tag"
-          status: "*"
-          patch_optional: true
-      commands:
-        - func: "download and merge coverage"
-
-    - name: "check-import-time"
-      tags: ["pr"]
-      commands:
-        - command: subprocess.exec
-          type: test
-          params:
-            binary: bash
-            working_dir: src
-            include_expansions_in_env: ["PYTHON_BINARY"]
-            args:
-              - .evergreen/scripts/check-import-time.sh
-              - ${revision}
-              - ${github_commit}
-    - name: "backport-pr"
-      allowed_requesters: ["commit"]
-      commands:
-      - command: subprocess.exec
-        type: test
-        params:
-          binary: bash
-          args:
-            - ${DRIVERS_TOOLS}/.evergreen/github_app/backport-pr.sh
-            - mongodb
-            - mongo-python-driver
-            - ${github_commit}
-
-buildvariants:
-
-- name: "Coverage Report"
-  display_name: "Coverage Report"
-  run_on:
-    - rhel84-small
-  tasks:
-     - name: "coverage-report"
-
-- name: testkms-variant
-  display_name: "KMS"
-  run_on:
-    - debian11-small
-  tasks:
-    - name: test-gcpkms
-      batchtime: 10080  # 7 days
-    - name: test-gcpkms-fail
-    - name: test-azurekms
-      batchtime: 10080  # 7 days
-    - name: test-azurekms-fail
-
-- name: rhel8-import-time
-  display_name: Import Time
-  run_on: rhel87-small
-  tasks:
-    - name: "check-import-time"
-
-- name: backport-pr
-  display_name: "Backport PR"
-  run_on:
-    - rhel8.7-small
-  tasks:
-    - name: "backport-pr"