Merge branch 'master' into PYTHON-4815

Author: sleepyStick

.evergreen/config.yml

@@ -2305,16 +2305,6 @@ axes:
         variables:
            COVERAGE: "coverage"
 
-  # Run pyopenssl tests?
-  - id: pyopenssl
-    display_name: "PyOpenSSL"
-    values:
-      - id: "enabled"
-        display_name: "PyOpenSSL"
-        variables:
-          test_pyopenssl: true
-        batchtime: 10080  # 7 days
-
   - id: versionedApi
     display_name: "versionedApi"
     values:
@@ -2592,76 +2582,100 @@ buildvariants:
 # Server tests for macOS Arm64.
 - name: test-macos-arm64-py3.9-auth-ssl-sync
   tasks:
-    - name: .standalone
+    - name: .standalone .6.0
+    - name: .standalone .7.0
+    - name: .standalone .8.0
+    - name: .standalone .rapid
+    - name: .standalone .latest
   display_name: Test macOS Arm64 py3.9 Auth SSL Sync
   run_on:
     - macos-14-arm64
   expansions:
     AUTH: auth
     SSL: ssl
     TEST_SUITES: default
-    PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.9/bin/python3
     SKIP_CSOT_TESTS: "true"
+    PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.9/bin/python3
 - name: test-macos-arm64-py3.9-auth-ssl-async
   tasks:
-    - name: .standalone
+    - name: .standalone .6.0
+    - name: .standalone .7.0
+    - name: .standalone .8.0
+    - name: .standalone .rapid
+    - name: .standalone .latest
   display_name: Test macOS Arm64 py3.9 Auth SSL Async
   run_on:
     - macos-14-arm64
   expansions:
     AUTH: auth
     SSL: ssl
     TEST_SUITES: default_async
-    PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.9/bin/python3
     SKIP_CSOT_TESTS: "true"
+    PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.9/bin/python3
 - name: test-macos-arm64-py3.13-noauth-ssl-sync
   tasks:
-    - name: .replica_set
+    - name: .replica_set .6.0
+    - name: .replica_set .7.0
+    - name: .replica_set .8.0
+    - name: .replica_set .rapid
+    - name: .replica_set .latest
   display_name: Test macOS Arm64 py3.13 NoAuth SSL Sync
   run_on:
     - macos-14-arm64
   expansions:
     AUTH: noauth
     SSL: ssl
     TEST_SUITES: default
-    PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.13/bin/python3
     SKIP_CSOT_TESTS: "true"
+    PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.13/bin/python3
 - name: test-macos-arm64-py3.13-noauth-ssl-async
   tasks:
-    - name: .replica_set
+    - name: .replica_set .6.0
+    - name: .replica_set .7.0
+    - name: .replica_set .8.0
+    - name: .replica_set .rapid
+    - name: .replica_set .latest
   display_name: Test macOS Arm64 py3.13 NoAuth SSL Async
   run_on:
     - macos-14-arm64
   expansions:
     AUTH: noauth
     SSL: ssl
     TEST_SUITES: default_async
-    PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.13/bin/python3
     SKIP_CSOT_TESTS: "true"
+    PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.13/bin/python3
 - name: test-macos-arm64-py3.9-noauth-nossl-sync
   tasks:
-    - name: .sharded_cluster
+    - name: .sharded_cluster .6.0
+    - name: .sharded_cluster .7.0
+    - name: .sharded_cluster .8.0
+    - name: .sharded_cluster .rapid
+    - name: .sharded_cluster .latest
   display_name: Test macOS Arm64 py3.9 NoAuth NoSSL Sync
   run_on:
     - macos-14-arm64
   expansions:
     AUTH: noauth
     SSL: nossl
     TEST_SUITES: default
-    PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.9/bin/python3
     SKIP_CSOT_TESTS: "true"
+    PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.9/bin/python3
 - name: test-macos-arm64-py3.9-noauth-nossl-async
   tasks:
-    - name: .sharded_cluster
+    - name: .sharded_cluster .6.0
+    - name: .sharded_cluster .7.0
+    - name: .sharded_cluster .8.0
+    - name: .sharded_cluster .rapid
+    - name: .sharded_cluster .latest
   display_name: Test macOS Arm64 py3.9 NoAuth NoSSL Async
   run_on:
     - macos-14-arm64
   expansions:
     AUTH: noauth
     SSL: nossl
     TEST_SUITES: default_async
-    PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.9/bin/python3
     SKIP_CSOT_TESTS: "true"
+    PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.9/bin/python3
 
 # Server tests for Windows.
 - name: test-win64-py3.9-auth-ssl-sync
@@ -3194,6 +3208,164 @@ buildvariants:
     COMPRESSORS: zstd
     PYTHON_BINARY: /opt/python/pypy3.9/bin/python3
 
+# Enterprise auth tests.
+- name: enterprise-auth-macos-py3.9-auth
+  tasks:
+    - name: test-enterprise-auth
+  display_name: Enterprise Auth macOS py3.9 Auth
+  run_on:
+    - macos-14
+  expansions:
+    AUTH: auth
+    PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.9/bin/python3
+- name: enterprise-auth-rhel8-py3.10-auth
+  tasks:
+    - name: test-enterprise-auth
+  display_name: Enterprise Auth RHEL8 py3.10 Auth
+  run_on:
+    - rhel87-small
+  expansions:
+    AUTH: auth
+    PYTHON_BINARY: /opt/python/3.10/bin/python3
+- name: enterprise-auth-rhel8-py3.11-auth
+  tasks:
+    - name: test-enterprise-auth
+  display_name: Enterprise Auth RHEL8 py3.11 Auth
+  run_on:
+    - rhel87-small
+  expansions:
+    AUTH: auth
+    PYTHON_BINARY: /opt/python/3.11/bin/python3
+- name: enterprise-auth-rhel8-py3.12-auth
+  tasks:
+    - name: test-enterprise-auth
+  display_name: Enterprise Auth RHEL8 py3.12 Auth
+  run_on:
+    - rhel87-small
+  expansions:
+    AUTH: auth
+    PYTHON_BINARY: /opt/python/3.12/bin/python3
+- name: enterprise-auth-win64-py3.13-auth
+  tasks:
+    - name: test-enterprise-auth
+  display_name: Enterprise Auth Win64 py3.13 Auth
+  run_on:
+    - windows-64-vsMulti-small
+  expansions:
+    AUTH: auth
+    PYTHON_BINARY: C:/python/Python313/python.exe
+- name: enterprise-auth-rhel8-pypy3.9-auth
+  tasks:
+    - name: test-enterprise-auth
+  display_name: Enterprise Auth RHEL8 pypy3.9 Auth
+  run_on:
+    - rhel87-small
+  expansions:
+    AUTH: auth
+    PYTHON_BINARY: /opt/python/pypy3.9/bin/python3
+- name: enterprise-auth-rhel8-pypy3.10-auth
+  tasks:
+    - name: test-enterprise-auth
+  display_name: Enterprise Auth RHEL8 pypy3.10 Auth
+  run_on:
+    - rhel87-small
+  expansions:
+    AUTH: auth
+    PYTHON_BINARY: /opt/python/pypy3.10/bin/python3
+
+# PyOpenSSL tests.
+- name: pyopenssl-macos-py3.9
+  tasks:
+    - name: .replica_set
+    - name: .7.0
+  display_name: PyOpenSSL macOS py3.9
+  run_on:
+    - macos-14
+  batchtime: 10080
+  expansions:
+    AUTH: noauth
+    test_pyopenssl: "true"
+    SSL: ssl
+    PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.9/bin/python3
+- name: pyopenssl-rhel8-py3.10
+  tasks:
+    - name: .replica_set
+    - name: .7.0
+  display_name: PyOpenSSL RHEL8 py3.10
+  run_on:
+    - rhel87-small
+  batchtime: 10080
+  expansions:
+    AUTH: auth
+    test_pyopenssl: "true"
+    SSL: ssl
+    PYTHON_BINARY: /opt/python/3.10/bin/python3
+- name: pyopenssl-rhel8-py3.11
+  tasks:
+    - name: .replica_set
+    - name: .7.0
+  display_name: PyOpenSSL RHEL8 py3.11
+  run_on:
+    - rhel87-small
+  batchtime: 10080
+  expansions:
+    AUTH: auth
+    test_pyopenssl: "true"
+    SSL: ssl
+    PYTHON_BINARY: /opt/python/3.11/bin/python3
+- name: pyopenssl-rhel8-py3.12
+  tasks:
+    - name: .replica_set
+    - name: .7.0
+  display_name: PyOpenSSL RHEL8 py3.12
+  run_on:
+    - rhel87-small
+  batchtime: 10080
+  expansions:
+    AUTH: auth
+    test_pyopenssl: "true"
+    SSL: ssl
+    PYTHON_BINARY: /opt/python/3.12/bin/python3
+- name: pyopenssl-win64-py3.13
+  tasks:
+    - name: .replica_set
+    - name: .7.0
+  display_name: PyOpenSSL Win64 py3.13
+  run_on:
+    - windows-64-vsMulti-small
+  batchtime: 10080
+  expansions:
+    AUTH: auth
+    test_pyopenssl: "true"
+    SSL: ssl
+    PYTHON_BINARY: C:/python/Python313/python.exe
+- name: pyopenssl-rhel8-pypy3.9
+  tasks:
+    - name: .replica_set
+    - name: .7.0
+  display_name: PyOpenSSL RHEL8 pypy3.9
+  run_on:
+    - rhel87-small
+  batchtime: 10080
+  expansions:
+    AUTH: auth
+    test_pyopenssl: "true"
+    SSL: ssl
+    PYTHON_BINARY: /opt/python/pypy3.9/bin/python3
+- name: pyopenssl-rhel8-pypy3.10
+  tasks:
+    - name: .replica_set
+    - name: .7.0
+  display_name: PyOpenSSL RHEL8 pypy3.10
+  run_on:
+    - rhel87-small
+  batchtime: 10080
+  expansions:
+    AUTH: auth
+    test_pyopenssl: "true"
+    SSL: ssl
+    PYTHON_BINARY: /opt/python/pypy3.10/bin/python3
+
 - matrix_name: "tests-fips"
   matrix_spec:
     platform:
@@ -3216,47 +3388,6 @@ buildvariants:
   tasks:
     - ".6.0"
 
-- matrix_name: "tests-pyopenssl"
-  matrix_spec:
-    platform: rhel8
-    python-version: "*"
-    auth: "*"
-    ssl: "ssl"
-    pyopenssl: "*"
-  # Only test "noauth" with Python 3.9.
-  exclude_spec:
-    platform: rhel8
-    python-version: ["3.10", "3.11", "3.12", "3.13", "pypy3.9", "pypy3.10"]
-    auth: "noauth"
-    ssl: "ssl"
-    pyopenssl: "*"
-  display_name: "PyOpenSSL ${platform} ${python-version} ${auth}"
-  tasks:
-    - '.replica_set'
-    # Test standalone and sharded only on 7.0.
-    - '.7.0'
-
-- matrix_name: "tests-pyopenssl-macOS"
-  matrix_spec:
-    platform: macos
-    auth: "auth"
-    ssl: "ssl"
-    pyopenssl: "*"
-  display_name: "PyOpenSSL ${platform} ${auth}"
-  tasks:
-    - '.replica_set'
-
-- matrix_name: "tests-pyopenssl-windows"
-  matrix_spec:
-    platform: windows
-    python-version-windows: "*"
-    auth: "auth"
-    ssl: "ssl"
-    pyopenssl: "*"
-  display_name: "PyOpenSSL ${platform} ${python-version-windows} ${auth}"
-  tasks:
-    - '.replica_set'
-
 - matrix_name: "tests-python-version-rhel8-without-c-extensions"
   matrix_spec:
     platform: rhel8
@@ -3350,24 +3481,6 @@ buildvariants:
   tasks:
      - ".latest"
 
-- matrix_name: "test-linux-enterprise-auth"
-  matrix_spec:
-    platform: rhel8
-    python-version: "*"
-    auth: "auth"
-  display_name: "Enterprise ${auth} ${platform} ${python-version}"
-  tasks:
-     - name: "test-enterprise-auth"
-
-- matrix_name: "tests-windows-enterprise-auth"
-  matrix_spec:
-    platform: windows
-    python-version-windows: "*"
-    auth: "auth"
-  display_name: "Enterprise ${auth} ${platform} ${python-version-windows}"
-  tasks:
-     - name: "test-enterprise-auth"
-
 - matrix_name: "test-search-index-helpers"
   matrix_spec:
     platform: rhel8

.evergreen/run-tests.sh

@@ -90,6 +90,8 @@ if [ -n "$TEST_ENTERPRISE_AUTH" ]; then
     export GSSAPI_HOST=${SASL_HOST}
     export GSSAPI_PORT=${SASL_PORT}
     export GSSAPI_PRINCIPAL=${PRINCIPAL}
+
+    export TEST_SUITES="auth"
 fi
 
 if [ -n "$TEST_LOADBALANCER" ]; then