Merge branch 'master' into better-comparison-assertions

Author: sleepyStick

.evergreen/generated_configs/tasks.yml

@@ -146,7 +146,7 @@ buildvariants:
       COMPRESSOR: zlib
   - name: compression-zstd-rhel8
     tasks:
-      - name: .test-standard !.server-4.0
+      - name: .test-standard !.server-4.2
     display_name: Compression zstd RHEL8
     run_on:
       - rhel87-small
@@ -522,13 +522,6 @@ buildvariants:
       PYTHON_BINARY: /opt/python/3.9/bin/python3
 
   # Server version tests
-  - name: mongodb-v4.0
-    tasks:
-      - name: .server-version
-    display_name: "* MongoDB v4.0"
-    run_on:
-      - rhel87-small
-    tags: [coverage_tag]
   - name: mongodb-v4.2
     tasks:
       - name: .server-version
@@ -586,26 +579,6 @@ buildvariants:
       - rhel87-small
     tags: [coverage_tag]
 
-  # Serverless tests
-  - name: serverless-rhel8-python3.9
-    tasks:
-      - name: .serverless
-    display_name: Serverless RHEL8 Python3.9
-    run_on:
-      - rhel87-small
-    batchtime: 10080
-    expansions:
-      PYTHON_BINARY: /opt/python/3.9/bin/python3
-  - name: serverless-rhel8-python3.13
-    tasks:
-      - name: .serverless
-    display_name: Serverless RHEL8 Python3.13
-    run_on:
-      - rhel87-small
-    batchtime: 10080
-    expansions:
-      PYTHON_BINARY: /opt/python/3.13/bin/python3
-
   # Stable api tests
   - name: stable-api-require-v1-rhel8-auth
     tasks:
@@ -684,11 +657,3 @@ buildvariants:
       - rhel87-small
     expansions:
       STORAGE_ENGINE: inmemory
-  - name: storage-mmapv1-rhel8
-    tasks:
-      - name: .test-standard !.sharded_cluster-auth-ssl .server-4.0
-    display_name: Storage MMAPv1 RHEL8
-    run_on:
-      - rhel87-small
-    expansions:
-      STORAGE_ENGINE: mmapv1

.evergreen/generated_configs/variants.yml

@@ -131,6 +131,9 @@ do
     gridfs)
       cpjson gridfs/tests gridfs
       ;;
+    handshake)
+      cpjson mongodb-handshake/tests handshake
+      ;;
     index|index-management)
       cpjson index-management/tests index_management
       ;;

.evergreen/resync-specs.sh

@@ -25,7 +25,6 @@
     get_task_name,
     get_variant_name,
     get_versions_from,
-    get_versions_until,
     handle_c_ext,
     write_functions_to_file,
     write_tasks_to_file,
@@ -196,7 +195,7 @@ def create_compression_variants():
     for compressor in "snappy", "zlib", "zstd":
         expansions = dict(COMPRESSOR=compressor)
         if compressor == "zstd":
-            tasks = [".test-standard !.server-4.0"]
+            tasks = [".test-standard !.server-4.2"]
         else:
             tasks = [".test-standard"]
         display_name = get_variant_name(f"Compression {compressor}", host)
@@ -249,16 +248,11 @@ def create_pyopenssl_variants():
 
 def create_storage_engine_variants():
     host = DEFAULT_HOST
-    engines = ["InMemory", "MMAPv1"]
+    engines = ["InMemory"]
     variants = []
     for engine in engines:
         expansions = dict(STORAGE_ENGINE=engine.lower())
-        if engine == engines[0]:
-            tasks = [".test-standard .standalone-noauth-nossl"]
-        else:
-            # MongoDB 4.2 drops support for MMAPv1
-            versions = get_versions_until("4.0")
-            tasks = [f".test-standard !.sharded_cluster-auth-ssl .server-{v}" for v in versions]
+        tasks = [".test-standard .standalone-noauth-nossl"]
         display_name = get_variant_name(f"Storage {engine}", host)
         variant = create_variant(tasks, display_name, host=host, expansions=expansions)
         variants.append(variant)
@@ -352,23 +346,6 @@ def create_disable_test_commands_variants():
     return [create_variant(tasks, display_name, host=host, python=python, expansions=expansions)]
 
 
-def create_serverless_variants():
-    host = DEFAULT_HOST
-    batchtime = BATCHTIME_WEEK
-    tasks = [".serverless"]
-    base_name = "Serverless"
-    return [
-        create_variant(
-            tasks,
-            get_variant_name(base_name, host, python=python),
-            host=host,
-            python=python,
-            batchtime=batchtime,
-        )
-        for python in MIN_MAX_PYTHON
-    ]
-
-
 def create_oidc_auth_variants():
     variants = []
     for host_name in ["ubuntu22", "macos", "win64"]:
@@ -920,7 +897,8 @@ def create_backport_pr_tasks():
         "${github_commit}",
     ]
     cmd = get_subprocess_exec(args=args)
-    return [EvgTask(name=name, commands=[cmd], allowed_requesters=["commit"])]
+    assume_func = FunctionCall(func="assume ec2 role")
+    return [EvgTask(name=name, commands=[assume_func, cmd], allowed_requesters=["commit"])]
 
 
 def create_ocsp_tasks():
@@ -968,14 +946,6 @@ def create_free_threading_tasks():
     return [EvgTask(name=task_name, tags=tags, commands=[server_func, test_func])]
 
 
-def create_serverless_tasks():
-    vars = dict(TEST_NAME="serverless", AUTH="auth", SSL="ssl")
-    test_func = FunctionCall(func="run tests", vars=vars)
-    tags = ["serverless"]
-    task_name = "test-serverless"
-    return [EvgTask(name=task_name, tags=tags, commands=[test_func])]
-
-
 ##############
 # Functions
 ##############

.evergreen/scripts/generate_config.py

@@ -21,7 +21,7 @@
 # Globals
 ##############
 
-ALL_VERSIONS = ["4.0", "4.2", "4.4", "5.0", "6.0", "7.0", "8.0", "rapid", "latest"]
+ALL_VERSIONS = ["4.2", "4.4", "5.0", "6.0", "7.0", "8.0", "rapid", "latest"]
 CPYTHONS = ["3.9", "3.10", "3.11", "3.12", "3.13"]
 PYPYS = ["pypy3.10"]
 ALL_PYTHONS = CPYTHONS + PYPYS

.evergreen/scripts/generate_config_utils.py

@@ -229,14 +229,6 @@ def handle_test_env() -> None:
             config = read_env(f"{DRIVERS_TOOLS}/.evergreen/atlas_data_lake/secrets-export.sh")
             DB_USER = config["ADL_USERNAME"]
             DB_PASSWORD = config["ADL_PASSWORD"]
-        elif test_name == "serverless":
-            run_command(f"bash {DRIVERS_TOOLS}/.evergreen/serverless/setup.sh")
-            config = read_env(f"{DRIVERS_TOOLS}/.evergreen/serverless/secrets-export.sh")
-            DB_USER = config["SERVERLESS_ATLAS_USER"]
-            DB_PASSWORD = config["SERVERLESS_ATLAS_PASSWORD"]
-            write_env("MONGODB_URI", config["SERVERLESS_URI"])
-            write_env("SINGLE_MONGOS_LB_URI", config["SERVERLESS_URI"])
-            write_env("MULTI_MONGOS_LB_URI", config["SERVERLESS_URI"])
         elif test_name == "auth_oidc":
             DB_USER = config["OIDC_ADMIN_USER"]
             DB_PASSWORD = config["OIDC_ADMIN_PWD"]

.evergreen/scripts/setup_tests.py

@@ -36,10 +36,6 @@
 elif TEST_NAME == "ocsp":
     run_command(f"bash {DRIVERS_TOOLS}/.evergreen/ocsp/teardown.sh")
 
-# Tear down serverless if applicable.
-elif TEST_NAME == "serverless":
-    run_command(f"bash {DRIVERS_TOOLS}/.evergreen/serverless/teardown.sh")
-
 # Tear down atlas cluster if applicable.
 if TEST_NAME in ["aws_lambda", "search_index"]:
     run_command(f"bash {DRIVERS_TOOLS}/.evergreen/atlas/teardown-atlas-cluster.sh")

.evergreen/scripts/teardown_tests.py

@@ -45,7 +45,6 @@ class Distro:
     "mockupdb": "mockupdb",
     "ocsp": "ocsp",
     "perf": "perf",
-    "serverless": "",
 }
 
 # Tests that require a sub test suite.
@@ -60,7 +59,6 @@ class Distro:
     "aws_lambda",
     "data_lake",
     "mockupdb",
-    "serverless",
     "ocsp",
 ]
 

.evergreen/scripts/utils.py

@@ -0,0 +1 @@
+* @mongodb/dbx-python

.github/CODEOWNERS

@@ -46,7 +46,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3
+      uses: github/codeql-action/init@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3
       with:
         languages: ${{ matrix.language }}
         build-mode: ${{ matrix.build-mode }}
@@ -63,6 +63,6 @@ jobs:
         pip install -e .
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3
+      uses: github/codeql-action/analyze@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3
       with:
         category: "/language:${{matrix.language}}"