CXX-2665 audit and refactor EVG matrices to use supported distros and extended coverage

.evergreen/config_generator/components/atlas_search_indexes.py

@@ -46,7 +46,7 @@ def functions():
 
 
 def tasks():
-    distro_name = 'ubuntu2004'
+    distro_name = 'rhel80'
     distro = find_large_distro(distro_name)
 
     return [

.evergreen/config_generator/components/clang_tidy.py

@@ -1,4 +1,5 @@
 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
@@ -24,6 +25,7 @@ class ClangTidy(Function):
             'cc_compiler',
             'cxx_compiler',
             'distro_id',
+            'UV_INSTALL_DIR',
         ],
         script='etc/run-clang-tidy.sh',
     )
@@ -42,7 +44,7 @@ def functions():
 
 
 def tasks():
-    distro_name = 'ubuntu2004'
+    distro_name = 'rhel80'
     distro = find_small_distro(distro_name)
 
     return [
@@ -52,6 +54,7 @@ def tasks():
             run_on=distro.name,
             commands=[
                 Setup.call(),
+                InstallUV.call(),
                 InstallCDriver.call(compiler='clang'),
                 ClangTidy.call(compiler='clang'),
             ],

.evergreen/config_generator/components/compile_only.py

@@ -1,11 +1,12 @@
 from config_generator.components.funcs.compile import Compile
 from config_generator.components.funcs.install_uv import InstallUV
-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.setup import Setup
 
-from config_generator.etc.distros import find_large_distro, make_distro_str
+from config_generator.etc.distros import compiler_to_vars, find_large_distro, make_distro_str
 
-from shrub.v3.evg_build_variant import BuildVariant
+from shrub.v3.evg_build_variant import BuildVariant, DisplayTask
+from shrub.v3.evg_command import KeyValueParam, expansions_update
 from shrub.v3.evg_task import EvgTask, EvgTaskRef
 
 from itertools import product
@@ -17,112 +18,110 @@
 # pylint: disable=line-too-long
 # fmt: off
 MATRIX = [
-    ('rhel79', None, ['Release'], ['shared'], ['impls']),
+    ('rhel80', 'gcc',   ['Debug', 'Release'], ['shared', 'static'], [11, 17, 20, 23]),
+    ('rhel80', 'clang', ['Debug', 'Release'], ['shared', 'static'], [11, 17, 20, 23]),
 
-    ('rhel81-power8',  None, ['Release'], ['shared'],  [None]),
-    ('rhel83-zseries', None, ['Release'], ['shared'],  [None]),
+    ('ubuntu2004-arm64', 'gcc',   ['Debug', 'Release'], ['shared', 'static'], [11, 17, 20, 23]),
+    ('ubuntu2004-arm64', 'clang', ['Debug', 'Release'], ['shared', 'static'], [11, 17, 20, 23]),
 
-    ('ubuntu2004', None,    ['Debug'], ['shared'],  [None]),
-    ('ubuntu2004', 'gcc',   ['Debug'], ['shared'],  [None]),
-    ('ubuntu2004', 'clang', ['Debug'], ['shared'],  [None]),
+    ('rhel8-power',   None, ['Debug', 'Release'], ['shared', 'static'], [11, 17]),
+    ('rhel8-zseries', None, ['Debug', 'Release'], ['shared', 'static'], [11, 17]),
 
-    ('windows-64-vs2015', 'vs2015x64', ['Debug', 'Release'], ['shared'],  [None]),
-    ('windows-vsCurrent', 'vs2017x64', ['Debug', 'Release'], ['shared'],  [None]),
-    ('windows-vsCurrent', 'vs2019x64', ['Debug', 'Release'], ['shared'],  [None]),
-    ('windows-vsCurrent', 'vs2022x64', ['Debug', 'Release'], ['shared'],  [None]),
+    ('macos-14-arm64', None, ['Debug', 'Release'], ['shared', 'static'], [11, 17]),
+    ('macos-14',       None, ['Debug', 'Release'], ['shared', 'static'], [11, 17]),
+
+    ('windows-64-vs2015', 'vs2015x64', ['Debug', 'Release'], ['shared', 'static'],  [11,           ]), # CXX-3215
+    ('windows-vsCurrent', 'vs2017x64', ['Debug', 'Release'], ['shared', 'static'],  [11, 17,       ]),
+    ('windows-vsCurrent', 'vs2019x64', ['Debug', 'Release'], ['shared', 'static'],  [11, 17, 20,   ]),
+    ('windows-vsCurrent', 'vs2022x64', ['Debug', 'Release'], ['shared', 'static'],  [11, 17, 20, 23]),
 ]
 # fmt: on
 # pylint: enable=line-too-long
 
 
-def generate_tasks():
-    res = []
-
-    for distro_name, compiler, build_types, link_types, polyfills in MATRIX:
-        for build_type, link_type, polyfill in product(build_types, link_types, polyfills):
+def tasks():
+    for distro_name, compiler, build_types, link_types, cxx_standards in MATRIX:
+        for build_type, link_type, cxx_standard in product(build_types, link_types, cxx_standards):
             distro = find_large_distro(distro_name)
 
             name = f'{TAG}-{make_distro_str(distro_name, compiler, None)}'
             tags = [TAG, distro_name]
 
+            if cxx_standard is not None:
+                name += f'-cxx{cxx_standard}'
+                tags += [f'cxx{cxx_standard}']
+
             if compiler is not None:
                 tags.append(compiler)
 
             name += f'-{build_type.lower()}-{link_type}'
             tags += [build_type.lower(), link_type]
 
-            if polyfill is not None:
-                name += f'-{polyfill}'
-                tags.append(polyfill)
+            updates = []
+            compile_vars = {}
+
+            updates += [KeyValueParam(key='build_type', value=build_type)]
+            updates += [KeyValueParam(key=key, value=value) for key, value in compiler_to_vars(compiler).items()]
 
-            patchable = None
+            if cxx_standard is not None:
+                compile_vars |= {'REQUIRED_CXX_STANDARD': cxx_standard}
+
+            if link_type == 'static':
+                compile_vars |= {'USE_STATIC_LIBS': 1}
 
             # PowerPC and zSeries are limited resources.
-            if any(pattern in distro_name for pattern in ['power8', 'zseries']):
-                patchable = False
-
-            # In etc/calc_release_version.py:
-            #   error: unknown option `format=...'
-            #   usage: git tag ...
-            #      or: ...
-            if distro_name == 'rhel79':
-                patchable = False
-
-            res.append(
-                EvgTask(
-                    name=name,
-                    tags=tags,
-                    run_on=distro.name,
-                    patchable=patchable,
-                    commands=[
-                        Setup.call(),
-                        FetchCDriverSource.call(),
-                    ] + (
-                        # DEVPROD-13875 + astral-sh/uv/issues/10231.
-                        [] if "vs2015" in distro_name else [InstallUV.call()]
-                    ) + [
-                        Compile.call(
-                            build_type=build_type,
-                            compiler=compiler,
-                            polyfill=polyfill,
-                        )
-                    ],
+            patchable = False if any(pattern in distro_name for pattern in ['power', 'zseries']) else None
+
+            commands = [expansions_update(updates=updates)] if updates else []
+            commands += [
+                Setup.call(),
+                InstallCDriver.call(),
+            ] + (
+                # DEVPROD-13875 + astral-sh/uv/issues/10231.
+                [] if "vs2015" in distro_name else [InstallUV.call()]
+            ) + [
+                Compile.call(
+                    build_type=build_type,
+                    compiler=compiler,
                 )
+            ]
+
+            yield EvgTask(
+                name=name,
+                tags=tags,
+                run_on=distro.name,
+                patchable=patchable,
+                commands=commands,
             )
 
-    return res
-
-
-TASKS = generate_tasks()
-
-
-def tasks():
-    res = TASKS.copy()
-
-    # PowerPC and zSeries are limited resources.
-    for task in res:
-        if any(pattern in task.run_on for pattern in ["power8", "zseries"]):
-            task.patchable = False
-
-    return res
-
 
 def variants():
     tasks = []
 
     one_day = 1440  # Seconds.
 
     # PowerPC and zSeries are limited resources.
-    tasks = [
-        EvgTaskRef(name=f'.{TAG} .rhel81-power8', batchtime=one_day),
-        EvgTaskRef(name=f'.{TAG} .rhel83-zseries', batchtime=one_day),
-        EvgTaskRef(name=f'.{TAG} !.rhel81-power8 !.rhel83-zseries'),
+    limited_distros = [
+        'rhel8-power',
+        'rhel8-zseries',
     ]
 
-    return [
-        BuildVariant(
-            name=f'{TAG}-matrix',
-            display_name=f'{TAG}-matrix',
-            tasks=tasks,
-        ),
+    distros = sorted(list({entry[0] for entry in MATRIX}))
+    batched = [distro for distro in distros if distro in limited_distros]
+    tasks = [
+        EvgTaskRef(name=f'.{TAG} .{distro}', batchtime=one_day) for distro in batched
+    ] + [
+        EvgTaskRef(name=f'.{TAG}' + ''.join(f' !.{distro}' for distro in batched))
     ]
+
+    yield BuildVariant(
+        name=f'{TAG}-matrix',
+        display_name=f'{TAG}-matrix',
+        tasks=tasks,
+        display_tasks=[
+            DisplayTask(
+                name=f'{TAG}-matrix',
+                execution_tasks=[f'.{TAG}' + ''.join(f' !.{distro}' for distro in batched)],
+            )
+        ],
+    )

.evergreen/config_generator/components/docker_build.py

@@ -15,8 +15,8 @@
 # pylint: disable=line-too-long
 # fmt: off
 MATRIX = [
-    ('ubuntu2204-arm64'),
-    ('ubuntu2204'),
+    ('ubuntu2204-arm64'), # `docker` is not available on RHEL distros by default.
+    ('ubuntu2204'),       # `docker` is not available on RHEL distros by default.
 ]
 # fmt: on
 # pylint: enable=line-too-long

.evergreen/config_generator/components/funcs/stop_mongod.py

@@ -13,8 +13,8 @@ class StopMongod(Function):
             set -o pipefail
             if cd drivers-evergreen-tools/.evergreen/orchestration 2>/dev/null; then
                 . ../venv-utils.sh
-                if venvactivate venv; then
-                mongo-orchestration stop
+                if venvactivate venv 2>/dev/null; then
+                    mongo-orchestration stop
                 fi
             fi
         '''

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

@@ -29,7 +29,6 @@ class Test(Function):
             'example_projects_cxxflags',
             'example_projects_ldflags',
             'generator',
-            'lib_dir',
             'MONGOCXX_TEST_TOPOLOGY',
             'MONGODB_API_VERSION',
             'platform',

.evergreen/config_generator/components/funcs/test_atlas_connectivity.py

@@ -13,7 +13,11 @@ class TestAtlasConnectivity(Function):
         script='''\
             export MONGOC_INSTALL_PREFIX=$(pwd)/../mongoc
             export MONGOCXX_INSTALL_PREFIX=$(pwd)/build/install
-            export LIB_DIR=${lib_dir}
+            if [[ "${distro_id}" == rhel* ]]; then
+                export LIB_DIR=lib64
+            else
+                export LIB_DIR=lib
+            fi
             export BUILD_TYPE=${build_type}
             export BUILD_DIR=$(pwd)/build
 

.evergreen/config_generator/components/funcs/test_auth.py

@@ -12,7 +12,11 @@ class TestAuth(Function):
         script='''\
             export MONGOC_INSTALL_PREFIX=$(pwd)/../mongoc
             export MONGOCXX_INSTALL_PREFIX=$(pwd)/build/install
-            export LIB_DIR=${lib_dir}
+            if [[ "${distro_id}" == rhel* ]]; then
+                export LIB_DIR=lib64
+            else
+                export LIB_DIR=lib
+            fi
             export BUILD_TYPE=${build_type}
             export BUILD_DIR=$(pwd)/build
             export URI="mongodb://bob:pwd123@localhost"