Merge branch 'master' of github.com:mongodb/mongo-python-driver

Author: blink1073

.evergreen/config.yml

@@ -267,28 +267,6 @@ functions:
         binary: bash
         args: [.evergreen/just.sh, run-tests]
 
-  "run enterprise auth tests":
-    - command: subprocess.exec
-      type: test
-      params:
-        binary: bash
-        working_dir: "src"
-        include_expansions_in_env: ["AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY", "AWS_SESSION_TOKEN", "PYTHON_BINARY"]
-        args:
-          - .evergreen/scripts/run-with-env.sh
-          - .evergreen/scripts/run-enterprise-auth-tests.sh
-
-  "run atlas tests":
-    - command: subprocess.exec
-      type: test
-      params:
-        binary: bash
-        include_expansions_in_env: ["AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY", "AWS_SESSION_TOKEN", "PYTHON_BINARY"]
-        working_dir: "src"
-        args:
-          - .evergreen/scripts/run-with-env.sh
-          - .evergreen/scripts/run-atlas-tests.sh
-
   "cleanup":
     - command: subprocess.exec
       params:
@@ -343,6 +321,7 @@ functions:
       params:
         working_dir: "src"
         binary: bash
+        include_expansions_in_env: [SUB_TEST_NAME]
         args:
           - .evergreen/scripts/run-with-env.sh
           - .evergreen/scripts/run-perf-tests.sh
@@ -422,13 +401,6 @@ tasks:
         - func: "run server"
         - func: "run doctests"
 
-    - name: "test-enterprise-auth"
-      tags: ["enterprise-auth"]
-      commands:
-        - func: "run server"
-        - func: "assume ec2 role"
-        - func: "run enterprise auth tests"
-
     - name: "test-search-index-helpers"
       commands:
         - func: "run server"
@@ -488,12 +460,6 @@ tasks:
             TOPOLOGY: "replica_set"
         - func: "run tests"
 
-    - name: "atlas-connect"
-      tags: ["atlas-connect"]
-      commands:
-        - func: "assume ec2 role"
-        - func: "run atlas tests"
-
     - name: atlas-data-lake-tests
       commands:
         - func: "bootstrap data lake"
@@ -547,6 +513,8 @@ tasks:
           vars:
             VERSION: "v6.0-perf"
         - func: "run perf tests"
+          vars:
+            SUB_TEST_NAME: "sync"
         - func: "attach benchmark test results"
         - func: "send dashboard data"
 
@@ -558,6 +526,8 @@ tasks:
             VERSION: "v6.0-perf"
             SSL: "ssl"
         - func: "run perf tests"
+          vars:
+            SUB_TEST_NAME: "sync"
         - func: "attach benchmark test results"
         - func: "send dashboard data"
 
@@ -568,9 +538,52 @@ tasks:
           vars:
             VERSION: "8.0"
         - func: "run perf tests"
+          vars:
+            SUB_TEST_NAME: "sync"
         - func: "attach benchmark test results"
         - func: "send dashboard data"
 
+    - name: "perf-6.0-standalone-async"
+      tags: [ "perf" ]
+      commands:
+        - func: "run server"
+          vars:
+            VERSION: "v6.0-perf"
+            TOPOLOGY: "server"
+        - func: "run perf tests"
+          vars:
+            SUB_TEST_NAME: "async"
+        - func: "attach benchmark test results"
+        - func: "send dashboard data"
+
+    - name: "perf-6.0-standalone-ssl-async"
+      tags: [ "perf" ]
+      commands:
+        - func: "run server"
+          vars:
+            VERSION: "v6.0-perf"
+            TOPOLOGY: "server"
+            SSL: "ssl"
+        - func: "run perf tests"
+          vars:
+            SUB_TEST_NAME: "async"
+        - func: "attach benchmark test results"
+        - func: "send dashboard data"
+
+    - name: "perf-8.0-standalone-async"
+      tags: [ "perf" ]
+      commands:
+        - func: "run server"
+          vars:
+            VERSION: "8.0"
+            TOPOLOGY: "server"
+        - func: "run perf tests"
+          vars:
+            SUB_TEST_NAME: "async"
+        - func: "attach benchmark test results"
+        - func: "send dashboard data"
+
+
     - name: "check-import-time"
       tags: ["pr"]
       commands:
@@ -651,17 +664,6 @@ buildvariants:
      - name: "perf-6.0-standalone"
      - name: "perf-6.0-standalone-ssl"
      - name: "perf-8.0-standalone"
-
-      # Platform notes
-      # i386 builds of OpenSSL or Cyrus SASL are not available
-      # Debian 8.1 only supports MongoDB 3.4+
-      # SUSE12 s390x is only supported by MongoDB 3.4+
-      # No enterprise build for Archlinux, SSL not available
-      # RHEL 7.6 and RHEL 8.4 only supports 3.6+.
-      # RHEL 7 only supports 2.6+
-      # RHEL 7.1 ppc64le is only supported by MongoDB 3.2+
-      # RHEL 7.2 s390x is only supported by MongoDB 3.4+
-      # Solaris MongoDB SSL builds are not available
-      # Darwin MongoDB SSL builds are not available for 2.6
-      # SUSE12 x86_64 is only supported by MongoDB 3.2+
-      # vim: set et sw=2 ts=2 :
+     - name: "perf-6.0-standalone-async"
+     - name: "perf-6.0-standalone-ssl-async"
+     - name: "perf-8.0-standalone-async"

.evergreen/generated_configs/tasks.yml

@@ -1,4 +1,13 @@
 tasks:
+  # Atlas connect tests
+  - name: test-atlas-connect
+    commands:
+      - func: assume ec2 role
+      - func: run tests
+        vars:
+          TEST_NAME: atlas_connect
+    tags: [atlas_connect]
+
   # Aws tests
   - name: test-auth-aws-4.4-regular
     commands:
@@ -680,6 +689,20 @@ tasks:
           AWS_ROLE_SESSION_NAME: test
     tags: [auth-aws, auth-aws-web-identity]
 
+  # Enterprise auth tests
+  - name: test-enterprise-auth
+    commands:
+      - func: run server
+        vars:
+          TEST_NAME: enterprise_auth
+          AUTH: auth
+      - func: assume ec2 role
+      - func: run tests
+        vars:
+          TEST_NAME: enterprise_auth
+          AUTH: auth
+    tags: [enterprise_auth]
+
   # Kms tests
   - name: test-gcpkms
     commands:

.evergreen/generated_configs/variants.yml

@@ -49,15 +49,15 @@ buildvariants:
   # Atlas connect tests
   - name: atlas-connect-rhel8-python3.9
     tasks:
-      - name: atlas-connect
+      - name: .atlas_connect
     display_name: Atlas connect RHEL8 Python3.9
     run_on:
       - rhel87-small
     expansions:
       PYTHON_BINARY: /opt/python/3.9/bin/python3
   - name: atlas-connect-rhel8-python3.13
     tasks:
-      - name: atlas-connect
+      - name: .atlas_connect
     display_name: Atlas connect RHEL8 Python3.13
     run_on:
       - rhel87-small
@@ -510,59 +510,53 @@ buildvariants:
     tags: [encryption_tag]
 
   # Enterprise auth tests
-  - name: auth-enterprise-macos-python3.9-auth
+  - name: auth-enterprise-macos-python3.9
     tasks:
-      - name: test-enterprise-auth
-    display_name: Auth Enterprise macOS Python3.9 Auth
+      - name: .enterprise_auth
+    display_name: Auth Enterprise macOS Python3.9
     run_on:
       - macos-14
     expansions:
-      AUTH: auth
       PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.9/bin/python3
-  - name: auth-enterprise-rhel8-python3.10-auth
+  - name: auth-enterprise-rhel8-python3.10
     tasks:
-      - name: test-enterprise-auth
-    display_name: Auth Enterprise RHEL8 Python3.10 Auth
+      - name: .enterprise_auth
+    display_name: Auth Enterprise RHEL8 Python3.10
     run_on:
       - rhel87-small
     expansions:
-      AUTH: auth
       PYTHON_BINARY: /opt/python/3.10/bin/python3
-  - name: auth-enterprise-rhel8-python3.11-auth
+  - name: auth-enterprise-rhel8-python3.11
     tasks:
-      - name: test-enterprise-auth
-    display_name: Auth Enterprise RHEL8 Python3.11 Auth
+      - name: .enterprise_auth
+    display_name: Auth Enterprise RHEL8 Python3.11
     run_on:
       - rhel87-small
     expansions:
-      AUTH: auth
       PYTHON_BINARY: /opt/python/3.11/bin/python3
-  - name: auth-enterprise-rhel8-python3.12-auth
+  - name: auth-enterprise-rhel8-python3.12
     tasks:
-      - name: test-enterprise-auth
-    display_name: Auth Enterprise RHEL8 Python3.12 Auth
+      - name: .enterprise_auth
+    display_name: Auth Enterprise RHEL8 Python3.12
     run_on:
       - rhel87-small
     expansions:
-      AUTH: auth
       PYTHON_BINARY: /opt/python/3.12/bin/python3
-  - name: auth-enterprise-win64-python3.13-auth
+  - name: auth-enterprise-win64-python3.13
     tasks:
-      - name: test-enterprise-auth
-    display_name: Auth Enterprise Win64 Python3.13 Auth
+      - name: .enterprise_auth
+    display_name: Auth Enterprise Win64 Python3.13
     run_on:
       - windows-64-vsMulti-small
     expansions:
-      AUTH: auth
       PYTHON_BINARY: C:/python/Python313/python.exe
-  - name: auth-enterprise-rhel8-pypy3.10-auth
+  - name: auth-enterprise-rhel8-pypy3.10
     tasks:
-      - name: test-enterprise-auth
-    display_name: Auth Enterprise RHEL8 PyPy3.10 Auth
+      - name: .enterprise_auth
+    display_name: Auth Enterprise RHEL8 PyPy3.10
     run_on:
       - rhel87-small
     expansions:
-      AUTH: auth
       PYTHON_BINARY: /opt/python/pypy3.10/bin/python3
 
   # Free threaded tests

.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-tests perf
+bash ./.evergreen/just.sh setup-tests perf "${SUB_TEST_NAME}"
 bash ./.evergreen/just.sh run-tests

.evergreen/scripts/generate_config.py

@@ -464,7 +464,6 @@ def create_compression_variants():
 
 
 def create_enterprise_auth_variants():
-    expansions = dict(AUTH="auth")
     variants = []
 
     # All python versions across platforms.
@@ -475,10 +474,8 @@ def create_enterprise_auth_variants():
             host = HOSTS["win64"]
         else:
             host = DEFAULT_HOST
-        display_name = get_display_name("Auth Enterprise", host, python=python, **expansions)
-        variant = create_variant(
-            ["test-enterprise-auth"], display_name, host=host, python=python, expansions=expansions
-        )
+        display_name = get_display_name("Auth Enterprise", host, python=python)
+        variant = create_variant([".enterprise_auth"], display_name, host=host, python=python)
         variants.append(variant)
 
     return variants
@@ -721,7 +718,7 @@ def create_atlas_connect_variants():
     host = DEFAULT_HOST
     return [
         create_variant(
-            ["atlas-connect"],
+            [".atlas_connect"],
             get_display_name("Atlas connect", host, python=python),
             python=python,
             host=host,
@@ -913,6 +910,25 @@ def _create_ocsp_task(algo, variant, server_type, base_task_name):
     return EvgTask(name=task_name, tags=tags, commands=commands)
 
 
+def create_atlas_connect_tasks():
+    vars = dict(TEST_NAME="atlas_connect")
+    assume_func = FunctionCall(func="assume ec2 role")
+    test_func = FunctionCall(func="run tests", vars=vars)
+    task_name = "test-atlas-connect"
+    tags = ["atlas_connect"]
+    return [EvgTask(name=task_name, tags=tags, commands=[assume_func, test_func])]
+
+
+def create_enterprise_auth_tasks():
+    vars = dict(TEST_NAME="enterprise_auth", AUTH="auth")
+    server_func = FunctionCall(func="run server", vars=vars)
+    assume_func = FunctionCall(func="assume ec2 role")
+    test_func = FunctionCall(func="run tests", vars=vars)
+    task_name = "test-enterprise-auth"
+    tags = ["enterprise_auth"]
+    return [EvgTask(name=task_name, tags=tags, commands=[server_func, assume_func, test_func])]
+
+
 def create_ocsp_tasks():
     tasks = []
     tests = [

.evergreen/scripts/run-atlas-tests.sh

@@ -1,4 +1,4 @@
 #!/bin/bash
 
 PROJECT_DIRECTORY=${PROJECT_DIRECTORY}
-bash "${PROJECT_DIRECTORY}"/.evergreen/run-perf-tests.sh
+SUB_TEST_NAME=${SUB_TEST_NAME} bash "${PROJECT_DIRECTORY}"/.evergreen/run-perf-tests.sh