CDRIVER-3620 Add SASL, CSE, and Sanitizers matrices

.evergreen/config_generator/components/c_std_compile.py

@@ -0,0 +1,105 @@
+from shrub.v3.evg_build_variant import BuildVariant
+from shrub.v3.evg_command import EvgCommandType
+from shrub.v3.evg_task import EvgTaskRef
+
+from config_generator.etc.distros import find_large_distro
+from config_generator.etc.distros import make_distro_str
+from config_generator.etc.distros import to_cc
+from config_generator.etc.function import Function
+from config_generator.etc.utils import bash_exec
+from config_generator.etc.utils import Task
+
+
+TAG = 'std-matrix'
+
+
+# pylint: disable=line-too-long
+# fmt: off
+MATRIX = [
+    ('archlinux',  'clang', None,   [11,   ]),
+    ('debian81',   'clang', None,   [11,   ]),
+    ('debian92',   'clang', None,   [11,   ]),
+    ('ubuntu1604', 'clang', 'i686', [11,   ]),
+    ('ubuntu1604', 'clang', None,   [11,   ]),
+    ('ubuntu1804', 'clang', 'i686', [11,   ]),
+    ('ubuntu1804', 'gcc',   None,   [11,   ]),
+    ('debian10',   'clang', None,   [11,   ]),
+    ('debian10',   'gcc',   None,   [11, 17]),
+    ('debian11',   'clang', None,   [11,   ]),
+    ('debian11',   'gcc',   None,   [11, 17]),
+    ('ubuntu2004', 'clang', None,   [11,   ]),
+    ('ubuntu2004', 'gcc',   None,   [11,   ]),
+]
+# fmt: on
+# pylint: enable=line-too-long
+
+
+class StdCompile(Function):
+    name = 'std-compile'
+    commands = [
+        bash_exec(
+            command_type=EvgCommandType.TEST,
+            add_expansions_to_env=True,
+            working_dir='mongoc',
+            script='.evergreen/scripts/compile-std.sh',
+        ),
+    ]
+
+    @classmethod
+    def call(cls, **kwargs):
+        return cls.default_call(**kwargs)
+
+
+def functions():
+    return StdCompile.defn()
+
+
+def tasks():
+    res = []
+
+    for distro_name, compiler, arch, stds in MATRIX:
+        tags = [TAG, distro_name, compiler, 'compile']
+
+        distro = find_large_distro(distro_name)
+
+        compile_vars = None
+        compile_vars = {'CC': to_cc(compiler)}
+
+        if arch:
+            tags.append(arch)
+            compile_vars.update({'MARCH': arch})
+
+        distro_str = make_distro_str(distro_name, compiler, arch)
+
+        for std in stds:
+            with_std = {}
+
+            if std >= 17:
+                # CMake 3.21 or newer is required to use CMAKE_C_STANDARD to
+                # specify C17 or newer.
+                with_std = {'CFLAGS': f'-std=c{std}'}
+            else:
+                with_std = {'C_STD_VERSION': std}
+
+            task_name = f'std-c{std}-{distro_str}-compile'
+
+            res.append(
+                Task(
+                    name=task_name,
+                    run_on=distro.name,
+                    tags=tags + [f'std-c{std}'],
+                    commands=[StdCompile.call(vars=compile_vars | with_std)],
+                )
+            )
+
+    return res
+
+
+def variants():
+    return [
+        BuildVariant(
+            name=TAG,
+            display_name=TAG,
+            tasks=[EvgTaskRef(name=f'.{TAG}')],
+        ),
+    ]

.evergreen/config_generator/components/cse/darwinssl.py

@@ -0,0 +1,79 @@
+from shrub.v3.evg_build_variant import BuildVariant
+from shrub.v3.evg_task import EvgTaskRef
+
+from config_generator.etc.compile import generate_compile_tasks
+
+from config_generator.etc.cse.compile import CompileCommon
+from config_generator.etc.cse.test import generate_test_tasks
+
+
+SSL = 'darwinssl'
+TAG = f'cse-matrix-{SSL}'
+
+
+# pylint: disable=line-too-long
+# fmt: off
+COMPILE_MATRIX = [
+    ('macos-1015', 'clang', None, ['cyrus']),
+]
+
+# TODO (CDRIVER-3789): test cse with the 'sharded' topology.
+TEST_MATRIX = [
+    ('macos-1015', 'clang', None, 'cyrus', ['auth'], ['server', 'replica' ], ['4.2', '4.4', '5.0']),
+
+    # Test 6.0+ with a replica set since Queryable Encryption does not support the 'server' topology.
+    ('macos-1015', 'clang', None, 'cyrus', ['auth'], ['server', 'replica' ], ['6.0', 'latest']),
+]
+# fmt: on
+# pylint: enable=line-too-long
+
+
+class DarwinSSLCompileCommon(CompileCommon):
+    ssl = 'DARWIN'
+
+
+class SaslCyrusDarwinSSLCompile(DarwinSSLCompileCommon):
+    name = 'cse-sasl-cyrus-darwinssl-compile'
+    commands = DarwinSSLCompileCommon.compile_commands(sasl='CYRUS')
+
+
+def functions():
+    return SaslCyrusDarwinSSLCompile.defn()
+
+
+def tasks():
+    res = []
+
+    SASL_TO_FUNC = {
+        'cyrus': SaslCyrusDarwinSSLCompile,
+    }
+
+    MORE_TAGS = ['cse']
+
+    res += generate_compile_tasks(
+        SSL, TAG, SASL_TO_FUNC, COMPILE_MATRIX, MORE_TAGS
+    )
+
+    res += generate_test_tasks(SSL, TAG, TEST_MATRIX)
+
+    # TODO: remove once MONGOCRYPT-443 is resolved.
+    for task in res:
+        task.disable = True
+
+    return res
+
+
+def variants():
+    expansions = {
+        'CLIENT_SIDE_ENCRYPTION': 'on',
+        'DEBUG': 'ON',
+    }
+
+    return [
+        BuildVariant(
+            name=TAG,
+            display_name=TAG,
+            tasks=[EvgTaskRef(name=f'.{TAG}')],
+            expansions=expansions,
+        ),
+    ]

.evergreen/config_generator/components/cse/openssl.py

@@ -0,0 +1,96 @@
+from shrub.v3.evg_build_variant import BuildVariant
+from shrub.v3.evg_task import EvgTaskRef
+
+from config_generator.etc.compile import generate_compile_tasks
+from config_generator.etc.function import merge_defns
+
+from config_generator.etc.cse.compile import CompileCommon
+from config_generator.etc.cse.test import generate_test_tasks
+
+
+SSL = 'openssl'
+TAG = f'cse-matrix-{SSL}'
+
+
+# pylint: disable=line-too-long
+# fmt: off
+COMPILE_MATRIX = [
+    ('debian10',          'gcc',       None, ['cyrus']),
+    ('debian11',          'gcc',       None, ['cyrus']),
+    ('debian92',          'clang',     None, ['cyrus']),
+    ('debian92',          'gcc',       None, ['cyrus']),
+    ('rhel80',            'gcc',       None, ['cyrus']),
+    ('rhel83-zseries',    'gcc',       None, ['cyrus']),
+    ('ubuntu1604',        'clang',     None, ['cyrus']),
+    ('ubuntu1804-arm64',  'gcc',       None, ['cyrus']),
+    ('ubuntu1804',        'gcc',       None, ['cyrus']),
+    ('ubuntu2004',        'gcc',       None, ['cyrus']),
+    ('windows-64-vs2017', 'vs2017x64', None, ['cyrus']),
+]
+
+# TODO (CDRIVER-3789): test cse with the 'sharded' topology.
+TEST_MATRIX = [
+    # 4.2 and 4.4 not available on rhel83-zseries.
+    ('rhel83-zseries', 'gcc', None, 'cyrus', ['auth'], ['server'], ['5.0']),
+
+    ('ubuntu1804-arm64',  'gcc',       None, 'cyrus', ['auth'], ['server'], ['4.2', '4.4', '5.0']),
+    ('ubuntu1804',        'gcc',       None, 'cyrus', ['auth'], ['server'], ['4.2', '4.4', '5.0']),
+    ('windows-64-vs2017', 'vs2017x64', None, 'cyrus', ['auth'], ['server'], ['4.2', '4.4', '5.0']),
+
+    # Test 6.0+ with a replica set since Queryable Encryption does not support the 'server' topology.
+    ('ubuntu1804',        'gcc',       None, 'cyrus', ['auth'], ['server', 'replica'], ['6.0', 'latest']),
+    ('rhel83-zseries',    'gcc',       None, 'cyrus', ['auth'], ['server', 'replica'], ['6.0', 'latest']),
+    ('ubuntu1804-arm64',  'gcc',       None, 'cyrus', ['auth'], ['server', 'replica'], ['6.0', 'latest']),
+    ('windows-64-vs2017', 'vs2017x64', None, 'cyrus', ['auth'], ['server', 'replica'], ['6.0', 'latest']),
+]
+# fmt: on
+# pylint: enable=line-too-long
+
+
+class OpenSSLCompileCommon(CompileCommon):
+    ssl = 'OPENSSL'
+
+
+class SaslCyrusOpenSSLCompile(OpenSSLCompileCommon):
+    name = 'cse-sasl-cyrus-openssl-compile'
+    commands = OpenSSLCompileCommon.compile_commands(sasl='CYRUS')
+
+
+def functions():
+    return merge_defns(
+        SaslCyrusOpenSSLCompile.defn(),
+    )
+
+
+def tasks():
+    res = []
+
+    SASL_TO_FUNC = {
+        'cyrus': SaslCyrusOpenSSLCompile,
+    }
+
+    MORE_TAGS = ['cse']
+
+    res += generate_compile_tasks(
+        SSL, TAG, SASL_TO_FUNC, COMPILE_MATRIX, MORE_TAGS
+    )
+
+    res += generate_test_tasks(SSL, TAG, TEST_MATRIX)
+
+    return res
+
+
+def variants():
+    expansions = {
+        'CLIENT_SIDE_ENCRYPTION': 'on',
+        'DEBUG': 'ON',
+    }
+
+    return [
+        BuildVariant(
+            name=TAG,
+            display_name=TAG,
+            tasks=[EvgTaskRef(name=f'.{TAG}')],
+            expansions=expansions,
+        ),
+    ]

.evergreen/config_generator/components/cse/winssl.py

@@ -0,0 +1,76 @@
+from shrub.v3.evg_build_variant import BuildVariant
+from shrub.v3.evg_task import EvgTaskRef
+
+from config_generator.etc.compile import generate_compile_tasks
+
+from config_generator.etc.cse.compile import CompileCommon
+from config_generator.etc.cse.test import generate_test_tasks
+
+
+SSL = 'winssl'
+TAG = f'cse-matrix-{SSL}'
+
+
+# pylint: disable=line-too-long
+# fmt: off
+COMPILE_MATRIX = [
+    ('windows-64-vs2015', 'vs2015x64', None, ['cyrus']),
+    ('windows-64-vs2017', 'vs2017x64', None, ['cyrus']),
+]
+
+# TODO (CDRIVER-3789): test cse with the 'sharded' topology.
+TEST_MATRIX = [
+    ('windows-64-vs2017', 'vs2017x64', None, 'cyrus', ['auth'], ['server'], ['4.2', '4.4', '5.0']),
+
+    # Test 6.0+ with a replica set since Queryable Encryption does not support the 'server' topology.
+    ('windows-64-vs2017', 'vs2017x64', None, 'cyrus', ['auth'], ['server', 'replica' ], ['6.0', 'latest']),
+]
+# fmt: on
+# pylint: enable=line-too-long
+
+
+class WinSSLCompileCommon(CompileCommon):
+    ssl = 'WINDOWS'
+
+
+class SaslCyrusWinSSLCompile(WinSSLCompileCommon):
+    name = 'cse-sasl-cyrus-winssl-compile'
+    commands = WinSSLCompileCommon.compile_commands(sasl='CYRUS')
+
+
+def functions():
+    return SaslCyrusWinSSLCompile.defn()
+
+
+def tasks():
+    res = []
+
+    SASL_TO_FUNC = {
+        'cyrus': SaslCyrusWinSSLCompile,
+    }
+
+    MORE_TAGS = ['cse']
+
+    res += generate_compile_tasks(
+        SSL, TAG, SASL_TO_FUNC, COMPILE_MATRIX, MORE_TAGS
+    )
+
+    res += generate_test_tasks(SSL, TAG, TEST_MATRIX)
+
+    return res
+
+
+def variants():
+    expansions = {
+        'CLIENT_SIDE_ENCRYPTION': 'on',
+        'DEBUG': 'ON',
+    }
+
+    return [
+        BuildVariant(
+            name=TAG,
+            display_name=TAG,
+            tasks=[EvgTaskRef(name=f'.{TAG}')],
+            expansions=expansions,
+        ),
+    ]

.evergreen/config_generator/components/funcs/upload_test_results.py

@@ -10,7 +10,7 @@ class UploadTestResults(Function):
         # Ensure attach_results does not fail even if no tests results exist.
         bash_exec(
             script='''\
-                mkdir mongoc
+                mkdir -p mongoc
                 touch mongoc/test-results.json
             '''
         ),