Update the releases/v4.1 branch with recent EVG config updates and fixes

.evergreen/config_generator/components/abi_stability.py

@@ -11,7 +11,6 @@
 
 from itertools import product
 
-
 TAG = 'abi-stability'
 
 
@@ -182,17 +181,18 @@ def task_groups():
         EvgTaskGroup(
             name=f'tg-{TAG}-{polyfill}-cxx{cxx_standard}',
             max_hosts=-1,
-            setup_group_can_fail_task=True,
+            setup_task_can_fail_task=True,
             setup_task=[
                 git_get_project(directory='mongo-cxx-driver'),
                 InstallCDriver.call(),
                 bash_exec(
+                    command_type=EvgCommandType.SETUP,
                     env={
                         'cxx_standard': f'{cxx_standard}',
                         'polyfill': polyfill,
                     },
                     include_expansions_in_env=['distro_id'],
-                    script='mongo-cxx-driver/.evergreen/scripts/abi-stability-setup.sh'
+                    script='mongo-cxx-driver/.evergreen/scripts/abi-stability-setup.sh',
                 ),
                 s3_put(
                     command_type=EvgCommandType.SETUP,

.evergreen/config_generator/components/atlas_search_indexes.py

@@ -1,7 +1,6 @@
 from config_generator.components.funcs.compile import Compile
 from config_generator.components.funcs.fetch_det import FetchDET
 from config_generator.components.funcs.install_c_driver import InstallCDriver
-from config_generator.components.funcs.install_uv import InstallUV
 from config_generator.components.funcs.setup import Setup
 
 from config_generator.etc.distros import find_large_distro
@@ -56,7 +55,6 @@ def tasks():
             run_on=distro.name,
             commands=[
                 InstallCDriver.call(),
-                InstallUV.call(),
                 Compile.call(build_type='Debug', vars={'ENABLE_TESTS': 'ON'}),
                 TestSearchIndexHelpers.call(),
             ],

.evergreen/config_generator/components/clang_tidy.py

@@ -1,5 +1,4 @@
 from config_generator.components.funcs.install_c_driver import InstallCDriver
-from config_generator.components.funcs.install_uv import InstallUV
 from config_generator.components.funcs.setup import Setup
 
 from config_generator.etc.distros import compiler_to_vars, find_small_distro
@@ -25,7 +24,6 @@ class ClangTidy(Function):
             'cc_compiler',
             'cxx_compiler',
             'distro_id',
-            'UV_INSTALL_DIR',
         ],
         script='etc/run-clang-tidy.sh',
     )
@@ -54,7 +52,6 @@ def tasks():
             run_on=distro.name,
             commands=[
                 Setup.call(),
-                InstallUV.call(),
                 InstallCDriver.call(compiler='clang'),
                 ClangTidy.call(compiler='clang'),
             ],

.evergreen/config_generator/components/cmake_compat.py

@@ -1,6 +1,5 @@
 from config_generator.components.funcs.fetch_c_driver_source import FetchCDriverSource
 from config_generator.components.funcs.install_c_driver import InstallCDriver
-from config_generator.components.funcs.install_uv import InstallUV
 from config_generator.components.funcs.setup import Setup
 
 from config_generator.etc.distros import find_small_distro
@@ -16,9 +15,10 @@
 # pylint: disable=line-too-long
 # fmt: off
 MATRIX = [
-    ("min",    [3, 15, 4]),
-    ("max-v3", [3, 31, 7]),
-    ("max",    [4,  0, 1]),
+    # As-if `cmake~=<version>` (PEP 0440).
+    ("min",    "3.15.0"),
+    ("max-v3", "3.0"   ),
+    ("max",    "4.0.0" ),
 ]
 # fmt: on
 
@@ -30,19 +30,17 @@ class CMakeCompat(Function):
             command_type=EvgCommandType.TEST,
             working_dir='mongo-cxx-driver',
             include_expansions_in_env=[
-                'CMAKE_MAJOR_VERSION',
-                'CMAKE_MINOR_VERSION',
-                'CMAKE_PATCH_VERSION',
+                'CMAKE_VERSION',
+                'distro_id',
                 'INSTALL_C_DRIVER',
             ],
             script='.evergreen/scripts/cmake-compat.sh',
         ),
         bash_exec(
             command_type=EvgCommandType.TEST,
             include_expansions_in_env=[
-                'CMAKE_MAJOR_VERSION',
-                'CMAKE_MINOR_VERSION',
-                'CMAKE_PATCH_VERSION',
+                'CMAKE_VERSION',
+                'distro_id',
                 'INSTALL_C_DRIVER',
             ],
             script='mongo-cxx-driver/.evergreen/scripts/cmake-compat-check.sh',
@@ -65,13 +63,10 @@ def tasks():
         for install_c_driver in install_c_driver_modes:
             commands = [
                 Setup.call(),
-                InstallUV.call(),
                 (InstallCDriver.call() if install_c_driver else FetchCDriverSource.call()),
                 CMakeCompat.call(
                     vars={
-                        'CMAKE_MAJOR_VERSION': version[0],
-                        'CMAKE_MINOR_VERSION': version[1],
-                        'CMAKE_PATCH_VERSION': version[2],
+                        'CMAKE_VERSION': version,
                         'INSTALL_C_DRIVER': int(install_c_driver),
                     },
                 ),

.evergreen/config_generator/components/compile_only.py

@@ -1,5 +1,4 @@
 from config_generator.components.funcs.compile import Compile
-from config_generator.components.funcs.install_uv import InstallUV
 from config_generator.components.funcs.install_c_driver import InstallCDriver
 from config_generator.components.funcs.setup import Setup
 
@@ -19,7 +18,6 @@
     # C++ standard and compiler coverage
 
     ('rhel80',     'clang',    [11, 17, 20,   ]), # Clang  7 (max: C++20)
-    ('ubuntu2004', 'clang-10', [11, 17, 20,   ]), # Clang 10 (max: C++20)
     ('rhel84',     'clang',    [11, 17, 20,   ]), # Clang 11 (max: C++20)
     ('ubuntu2204', 'clang-12', [11, 17, 20, 23]), # Clang 12 (max: C++23)
     ('rhel90',     'clang',    [11, 17, 20, 23]), # Clang 13 (max: C++23)
@@ -29,16 +27,16 @@
     ('rhel94',     'clang',    [11, 17, 20, 23]), # Clang 17 (max: C++23)
     ('rhel95',     'clang',    [11, 17, 20, 23]), # Clang 19 (max: C++23)
 
-    ('rhel76',     'gcc',    [11, 14,       ]), # GCC  4.8 (max: C++14)
-    ('rhel80',     'gcc',    [11, 17, 20,   ]), # GCC  8.2 (max: C++20)
-    ('debian10',   'gcc-8',  [11, 17, 20,   ]), # GCC  8.3 (max: C++20)
-    ('rhel84',     'gcc',    [11, 17, 20,   ]), # GCC  8.4 (max: C++20)
-    ('ubuntu2004', 'gcc-9',  [11, 17, 20,   ]), # GCC  9.4 (max: C++20)
-    ('debian11',   'gcc-10', [11, 17, 20,   ]), # GCC 10.2 (max: C++20)
-    ('rhel90',     'gcc',    [11, 17, 20, 23]), # GCC 11.2 (max: C++23)
-    ('rhel92',     'gcc',    [11, 17, 20, 23]), # GCC 11.3 (max: C++23)
-    ('rhel94',     'gcc',    [11, 17, 20, 23]), # GCC 11.4 (max: C++23)
-    ('rhel95',     'gcc',    [11, 17, 20, 23]), # GCC 11.5 (max: C++23)
+    ('rhel7.9',         'gcc',    [11, 14,       ]), # GCC  4.8 (max: C++14)
+    ('rhel80',          'gcc',    [11, 17, 20,   ]), # GCC  8.2 (max: C++20)
+    ('rhel84',          'gcc',    [11, 17, 20,   ]), # GCC  8.4 (max: C++20)
+    ('debian11-latest', 'gcc-10', [11, 17, 20,   ]), # GCC 10.2 (max: C++20)
+    ('rhel90',          'gcc',    [11, 17, 20, 23]), # GCC 11.2 (max: C++23)
+    ('rhel92',          'gcc',    [11, 17, 20, 23]), # GCC 11.3 (max: C++23)
+    ('rhel94',          'gcc',    [11, 17, 20, 23]), # GCC 11.4 (max: C++23)
+    ('rhel95',          'gcc',    [11, 17, 20, 23]), # GCC 11.5 (max: C++23)
+    ('debian12-latest', 'gcc',    [11, 17, 20, 23]), # GCC 12.2 (max: C++23)
+    ('ubuntu2404',      'gcc-13', [11, 17, 20, 23]), # GCC 13.3 (max: C++23)
 
     ('windows-vsCurrent', 'vs2015x64', [11, 14,             'latest']), # Max: C++14
     ('windows-vsCurrent', 'vs2017x64', [11, 14, 17, 20,     'latest']), # Max: C++20
@@ -47,8 +45,10 @@
 
     # Other coverage.
 
-    ('ubuntu2004-arm64', 'gcc',   [11, 17]), # Clang 10
-    ('ubuntu2004-arm64', 'clang', [11, 17]), # Clang 10
+    ('ubuntu2204-arm64', 'gcc',   [11, 17]), # GCC 11.4
+    ('ubuntu2404-arm64', 'gcc',   [11, 17]), # GCC 13.3
+    ('ubuntu2204-arm64', 'clang', [11, 17]), # Clang 14
+    ('ubuntu2404-arm64', 'clang', [11, 17]), # Clang 18
 
     ('rhel8-power',   None, [11, 17]),
     ('rhel8-zseries', None, [11, 17]),
@@ -96,7 +96,6 @@ def tasks():
             commands += [
                 Setup.call(),
                 InstallCDriver.call(),
-                InstallUV.call(),
                 Compile.call(
                     build_type=build_type,
                     compiler=compiler,

.evergreen/config_generator/components/funcs/compile.py

@@ -30,7 +30,6 @@ class Compile(Function):
             'USE_SANITIZER_ASAN',
             'USE_SANITIZER_UBSAN',
             'USE_STATIC_LIBS',
-            'UV_INSTALL_DIR',
         ],
         working_dir='mongo-cxx-driver',
         script='.evergreen/scripts/compile.sh',

.evergreen/config_generator/components/funcs/install_c_driver.py

@@ -7,11 +7,10 @@
 from typing import Mapping
 
 
-# If updating mongoc_version_minimum, also update:
+# If updating mongoc_version_minimum to a new release (not pinning to an unreleased commit), also update:
 # - BSON_REQUIRED_VERSION and MONGOC_REQUIRED_VERSION in CMakeLists.txt
 # - the version of pkg:github/mongodb/mongo-c-driver in etc/purls.txt
 # - the default value of --c-driver-build-ref in etc/make_release.py
-# Only MONGOC_DOWNLOAD_VERSION needs to be updated when pinning to an unreleased commit.
 # If pinning to an unreleased commit, create a "Blocked" JIRA ticket with
 # a "depends on" link to the appropriate C Driver version release ticket.
 MONGOC_VERSION_MINIMUM = '2.0.0'

.evergreen/config_generator/components/funcs/setup.py

@@ -1,39 +1,11 @@
 from config_generator.etc.function import Function
-from config_generator.etc.utils import bash_exec
 
-from shrub.v3.evg_command import EvgCommandType, git_get_project
+from shrub.v3.evg_command import git_get_project
 
 
 class Setup(Function):
     name = 'setup'
-    commands = [
-        bash_exec(
-            command_type=EvgCommandType.SETUP,
-            script='''\
-                set -o errexit
-                set -o pipefail
-                rm -rf "mongo-cxx-driver"
-                rm -fr "mongo-c-driver"
-                rm -fr mongod
-                rm -fr drivers-evergreen-tools
-            '''
-        ),
-        git_get_project(directory='mongo-cxx-driver'),
-        bash_exec(
-            command_type=EvgCommandType.SETUP,
-            script='''\
-                set -o errexit
-                set -o pipefail
-                cc --version || true
-                c++ --version || true
-                gcc --version || true
-                g++ --version || true
-                clang --version || true
-                cmake --version || true
-                openssl version || true
-            '''
-        ),
-    ]
+    commands = git_get_project(directory='mongo-cxx-driver')
 
 
 def functions():

.evergreen/config_generator/components/funcs/test.py

@@ -12,6 +12,7 @@ class Test(Function):
     commands = bash_exec(
         command_type=EvgCommandType.TEST,
         include_expansions_in_env=[
+            'ASAN_SYMBOLIZER_PATH',
             'build_type',
             'CRYPT_SHARED_LIB_PATH',  # Set by run-orchestration.sh in "start_mongod".
             'cse_aws_access_key_id',
@@ -33,6 +34,7 @@ class Test(Function):
             'MONGODB_API_VERSION',
             'platform',
             'TEST_WITH_ASAN',
+            'TEST_WITH_CSFLE',
             'TEST_WITH_UBSAN',
             'TEST_WITH_VALGRIND',
             'use_mongocryptd',