CXX-3187 Extend ABI stability tasks to C++20 and C++23

.evergreen/config_generator/components/abi_stability.py

@@ -9,15 +9,20 @@
 from shrub.v3.evg_task import EvgTask, EvgTaskRef
 from shrub.v3.evg_task_group import EvgTaskGroup
 
+from itertools import product
+
 
 TAG = 'abi-stability'
 
 
 # pylint: disable=line-too-long
 # fmt: off
 MATRIX = [
-    ('polyfill', 11),
-    ('stdlib',   17),
+    ('impls',  11),
+    ('impls',  17),
+    ('stdlib', 17),
+    ('stdlib', 20),
+    ('stdlib', 23),
 ]
 # fmt: on
 # pylint: enable=line-too-long
@@ -43,7 +48,7 @@ class AbiComplianceCheck(Function):
             display_name='ABI Compliance Check (Stable): ',
             local_files_include_filter='cxx-abi/compat_reports/**/compat_report.html',
             permissions='public-read',
-            remote_file='mongo-cxx-driver/${branch_name}/${revision}/${version_id}/${build_id}/${execution}/abi-compliance-check/abi/',
+            remote_file='mongo-cxx-driver/${branch_name}/${revision}/${version_id}/${build_id}/${task_id}/${execution}/abi-compliance-check/abi/',
         ),
         s3_put(
             command_type=EvgCommandType.SYSTEM,
@@ -54,7 +59,7 @@ class AbiComplianceCheck(Function):
             display_name='ABI Compliance Check (Stable): ',
             local_files_include_filter='cxx-abi/logs/**/log.txt',
             permissions='public-read',
-            remote_file='mongo-cxx-driver/${branch_name}/${revision}/${version_id}/${build_id}/${execution}/abi-compliance-check/abi/',
+            remote_file='mongo-cxx-driver/${branch_name}/${revision}/${version_id}/${build_id}/${task_id}/${execution}/abi-compliance-check/abi/',
         ),
         s3_put(
             command_type=EvgCommandType.SYSTEM,
@@ -65,7 +70,7 @@ class AbiComplianceCheck(Function):
             display_name='ABI Compliance Check (Unstable): ',
             local_files_include_filter='cxx-noabi/compat_reports/**/compat_report.html',
             permissions='public-read',
-            remote_file='mongo-cxx-driver/${branch_name}/${revision}/${version_id}/${build_id}/${execution}/abi-compliance-check/noabi/',
+            remote_file='mongo-cxx-driver/${branch_name}/${revision}/${version_id}/${build_id}/${task_id}/${execution}/abi-compliance-check/noabi/',
         ),
         s3_put(
             command_type=EvgCommandType.SYSTEM,
@@ -76,7 +81,7 @@ class AbiComplianceCheck(Function):
             display_name='ABI Compliance Check (Unstable): ',
             local_files_include_filter='cxx-noabi/logs/**/log.txt',
             permissions='public-read',
-            remote_file='mongo-cxx-driver/${branch_name}/${revision}/${version_id}/${build_id}/${execution}/abi-compliance-check/noabi/',
+            remote_file='mongo-cxx-driver/${branch_name}/${revision}/${version_id}/${build_id}/${task_id}/${execution}/abi-compliance-check/noabi/',
         ),
     ]
 
@@ -101,7 +106,7 @@ class Abidiff(Function):
             display_name='abidiff (Stable): ',
             local_files_include_filter='cxx-abi/*.txt',
             permissions='public-read',
-            remote_file='mongo-cxx-driver/${branch_name}/${revision}/${version_id}/${build_id}/${execution}/abidiff/abi/',
+            remote_file='mongo-cxx-driver/${branch_name}/${revision}/${version_id}/${build_id}/${task_id}/${execution}/abidiff/abi/',
         ),
         s3_put(
             command_type=EvgCommandType.SYSTEM,
@@ -112,7 +117,7 @@ class Abidiff(Function):
             display_name='abidiff (Unstable): ',
             local_files_include_filter='cxx-noabi/*.txt',
             permissions='public-read',
-            remote_file='mongo-cxx-driver/${branch_name}/${revision}/${version_id}/${build_id}/${execution}/abidiff/noabi/',
+            remote_file='mongo-cxx-driver/${branch_name}/${revision}/${version_id}/${build_id}/${task_id}/${execution}/abidiff/noabi/',
         ),
     ]
 
@@ -133,57 +138,96 @@ def functions():
     )
 
 
-def tasks():
-    distro_name = 'ubuntu2204'
-    distro = find_large_distro(distro_name)
-
-    return [
-        EvgTask(
-            name=func.name,
-            tags=[TAG, func.name, distro_name],
-            run_on=distro.name,
-            commands=[func.call()],
+def generate_tasks():
+    funcs = [AbiComplianceCheck, Abidiff, AbiProhibitedSymbols]
+
+    tasks = []
+
+    for func, (polyfill, cxx_standard) in product(funcs, MATRIX):
+        if func is Abidiff:
+            distro_name = 'ubuntu2204'  # Clang 12, libabigail is not available on RHEL distros.
+        else:
+            distro_name = 'rhel9-latest'  # Clang 17.
+
+        distro = find_large_distro(distro_name)
+
+        tasks.append(
+            EvgTask(
+                name=f'{func.name}-{polyfill}-cxx{cxx_standard}',
+                tags=[TAG, distro_name, func.name, polyfill, f'cxx{cxx_standard}'],
+                run_on=distro.name,
+                commands=[
+                    func.call(
+                        vars={
+                            'cxx_standard': f'{cxx_standard}',
+                            'polyfill': polyfill,
+                        }
+                    )
+                ],
+            )
         )
-        for func in [AbiComplianceCheck, Abidiff, AbiProhibitedSymbols]
-    ]
+
+    return tasks
+
+
+TASKS = generate_tasks()
+
+
+def tasks():
+    return TASKS
 
 
 def task_groups():
     return [
         EvgTaskGroup(
-            name=f'tg-{TAG}',
+            name=f'tg-{TAG}-{polyfill}-cxx{cxx_standard}',
             max_hosts=-1,
             setup_group_can_fail_task=True,
             setup_task=[
                 git_get_project(directory='mongo-cxx-driver'),
                 InstallCDriver.call(),
                 bash_exec(
-                    include_expansions_in_env=['cxx_standard'],
+                    env={
+                        'cxx_standard': f'{cxx_standard}',
+                        'polyfill': polyfill,
+                    },
+                    include_expansions_in_env=['distro_id'],
                     script='mongo-cxx-driver/.evergreen/scripts/abi-stability-setup.sh'
                 ),
+                s3_put(
+                    command_type=EvgCommandType.SETUP,
+                    aws_key='${aws_key}',
+                    aws_secret='${aws_secret}',
+                    bucket='mciuploads',
+                    content_type='text/plain',
+                    display_name='ABI Stability Setup: ',
+                    local_files_include_filter='*.log',
+                    permissions='public-read',
+                    remote_file='mongo-cxx-driver/${branch_name}/${revision}/${version_id}/${build_id}/${task_id}/${execution}/abi-stability-setup/',
+                ),
             ],
-            tasks=[f'.{TAG}'],
+            tasks=[task.name for task in TASKS if polyfill in task.name and f'cxx{cxx_standard}' in task.name],
             teardown_task_can_fail_task=True,
             teardown_task=[bash_exec(script='rm -rf *'),],
         )
+        for polyfill, cxx_standard in MATRIX
     ]
 
 
 def variants():
     return [
         BuildVariant(
-            name=f'abi-stability-{name}',
-            display_name=f'ABI Stability Checks ({name})',
-            expansions={
-                'cxx_standard': f'{cxx_standard}',  # Use a polyfill library.
-            },
-            tasks=[EvgTaskRef(name='tg-abi-stability')],
+            name=f'abi-stability',
+            display_name=f'ABI Stability Checks',
+            tasks=[
+                EvgTaskRef(name=f'tg-{TAG}-{polyfill}-cxx{cxx_standard}')
+                for polyfill, cxx_standard in MATRIX
+            ],
             display_tasks=[
                 DisplayTask(
-                    name=f'ABI Stability Checks ({name})',
+                    name=f'ABI Stability Checks',
                     execution_tasks=[f'.{TAG}'],
                 )
             ],
         )
-        for name, cxx_standard in MATRIX
     ]

.evergreen/config_generator/etc/distros.py

@@ -82,6 +82,8 @@ def validate_os_ver(cls, value):
 
     Distro(name='rhel8-latest-large', os='rhel', os_type='linux', os_ver='latest', size='large'),
     Distro(name='rhel8-latest-small', os='rhel', os_type='linux', os_ver='latest', size='small'),
+    Distro(name='rhel9-latest-large', os='rhel', os_type='linux', os_ver='latest', size='large'),
+    Distro(name='rhel9-latest-small', os='rhel', os_type='linux', os_ver='latest', size='small'),
 ]
 
 RHEL_ARM64_DISTROS = [

.evergreen/generated_configs/functions.yml

@@ -24,7 +24,7 @@ functions:
         content_type: text/html
         local_files_include_filter: cxx-abi/compat_reports/**/compat_report.html
         permissions: public-read
-        remote_file: mongo-cxx-driver/${branch_name}/${revision}/${version_id}/${build_id}/${execution}/abi-compliance-check/abi/
+        remote_file: mongo-cxx-driver/${branch_name}/${revision}/${version_id}/${build_id}/${task_id}/${execution}/abi-compliance-check/abi/
     - command: s3.put
       type: system
       params:
@@ -35,7 +35,7 @@ functions:
         content_type: text/plain
         local_files_include_filter: cxx-abi/logs/**/log.txt
         permissions: public-read
-        remote_file: mongo-cxx-driver/${branch_name}/${revision}/${version_id}/${build_id}/${execution}/abi-compliance-check/abi/
+        remote_file: mongo-cxx-driver/${branch_name}/${revision}/${version_id}/${build_id}/${task_id}/${execution}/abi-compliance-check/abi/
     - command: s3.put
       type: system
       params:
@@ -46,7 +46,7 @@ functions:
         content_type: text/html
         local_files_include_filter: cxx-noabi/compat_reports/**/compat_report.html
         permissions: public-read
-        remote_file: mongo-cxx-driver/${branch_name}/${revision}/${version_id}/${build_id}/${execution}/abi-compliance-check/noabi/
+        remote_file: mongo-cxx-driver/${branch_name}/${revision}/${version_id}/${build_id}/${task_id}/${execution}/abi-compliance-check/noabi/
     - command: s3.put
       type: system
       params:
@@ -57,7 +57,7 @@ functions:
         content_type: text/plain
         local_files_include_filter: cxx-noabi/logs/**/log.txt
         permissions: public-read
-        remote_file: mongo-cxx-driver/${branch_name}/${revision}/${version_id}/${build_id}/${execution}/abi-compliance-check/noabi/
+        remote_file: mongo-cxx-driver/${branch_name}/${revision}/${version_id}/${build_id}/${task_id}/${execution}/abi-compliance-check/noabi/
   abi-prohibited-symbols:
     command: subprocess.exec
     type: test
@@ -91,7 +91,7 @@ functions:
         content_type: text/plain
         local_files_include_filter: cxx-abi/*.txt
         permissions: public-read
-        remote_file: mongo-cxx-driver/${branch_name}/${revision}/${version_id}/${build_id}/${execution}/abidiff/abi/
+        remote_file: mongo-cxx-driver/${branch_name}/${revision}/${version_id}/${build_id}/${task_id}/${execution}/abidiff/abi/
     - command: s3.put
       type: system
       params:
@@ -102,7 +102,7 @@ functions:
         content_type: text/plain
         local_files_include_filter: cxx-noabi/*.txt
         permissions: public-read
-        remote_file: mongo-cxx-driver/${branch_name}/${revision}/${version_id}/${build_id}/${execution}/abidiff/noabi/
+        remote_file: mongo-cxx-driver/${branch_name}/${revision}/${version_id}/${build_id}/${task_id}/${execution}/abidiff/noabi/
   backtrace:
     command: subprocess.exec
     type: system