MDBF-1195: Use clang-22 for increased coverage

Author: RazvanLiviuVarzaru

configuration/builders/definitions/connectors/conodbc.py

@@ -56,8 +56,7 @@ def generate_bintar_sqs(
     ops,
     version,
     upload_packages_to_ci=True,
-    with_asan=False,
-    with_ubsan=False,
+    with_asan_ubsan=False,
 ):
     return [
         get_source_package(
@@ -70,8 +69,7 @@ def generate_bintar_sqs(
             bintar_path=BINTAR_PATH,
             package_platform_suffix=f"{ops}{version}",
             jobs=util.Property("jobs"),
-            with_asan=with_asan,
-            with_ubsan=with_ubsan,
+            with_asan_ubsan=with_asan_ubsan,
         ),
     ] + (
         [
@@ -240,30 +238,16 @@ def generate_deb_release_sq(ops, version):
         )
         RELEASE_BUILDERS_BY_ARCH[arch].append(builder)
 
-ASAN_BUILDER = GenericBuilder(
-    name="codbc-debian-13-asan",
+UBASAN_BUILDER = GenericBuilder(
+    name="codbc-debian-13-ubasan-clang-22",
     sidecar=SIDECAR,
     sequences=generate_bintar_sqs(
         build_environment=docker_config(
-            image="debian13",
+            image="debian13-msan-clang-22",
         ),
         ops="debian",
         version="13",
         upload_packages_to_ci=False,
-        with_asan=True,
-    ),
-)
-
-UBSAN_BUILDER = GenericBuilder(
-    name="codbc-debian-13-ubsan",
-    sidecar=SIDECAR,
-    sequences=generate_bintar_sqs(
-        build_environment=docker_config(
-            image="debian13",
-        ),
-        ops="debian",
-        version="13",
-        upload_packages_to_ci=False,
-        with_ubsan=True,
+        with_asan_ubsan=True,
     ),
 )

configuration/builders/sequences/connectors/conodbc.py

@@ -648,20 +648,29 @@ def bintar(
     package_platform_suffix: str,
     bintar_path: str,
     source_path: str,
-    with_asan=False,
-    with_ubsan=False,
+    with_asan_ubsan=False,
 ):
 
+    env_vars = None
     flags = [
         CMakeOption(OTHER.CONC_WITH_UNIT_TESTS, False),
         CMakeOption(CMAKE.BUILD_TYPE, BuildType.RELWITHDEBUG),
         CMakeOption(OTHER.PACKAGE_PLATFORM_SUFFIX, package_platform_suffix),
     ]
 
-    if with_asan:
+    if with_asan_ubsan:
         flags.append(CMakeOption(WITH.ASAN, True))
-    if with_ubsan:
         flags.append(CMakeOption(WITH.UBSAN, True))
+        env_vars = [
+            (
+                "ASAN_OPTIONS",
+                "detect_stack_use_after_return=1:detect_leaks=1:abort_on_error=1:atexit=0:detect_invalid_pointer_pairs=3:dump_instruction_bytes=1:allocator_may_return_null=1",
+            ),
+            (
+                "UBSAN_OPTIONS",
+                "print_stacktrace=1:report_error_type=1:halt_on_error=1",
+            ),
+        ]
 
     sequence = BuildSequence()
     sequence.add_step(
@@ -676,6 +685,7 @@ def bintar(
                         flags=flags,
                     ),
                 ),
+                env_vars=env_vars,
                 options=StepOptions(
                     description="Bintar - Configure CMake",
                     descriptionDone="Bintar - CMake configured",
@@ -693,6 +703,7 @@ def bintar(
                     target=MAKE.PACKAGE,
                     jobs=jobs,
                 ),
+                env_vars=env_vars,
                 options=StepOptions(
                     description="Bintar - Compile",
                     descriptionDone="Bintar - Compile done",
@@ -722,7 +733,8 @@ def bintar(
                     ("TEST_VERBOSE", "true"),
                     ("TEST_DRIVER", "maodbc_test"),
                     ("TEST_DSN", "maodbc_test"),
-                ],
+                ]
+                + (env_vars if env_vars else []),
                 options=StepOptions(
                     description="Bintar - Run ODBC ctest",
                     descriptionDone="Bintar - ODBC ctest done",

configuration/schedulers/connectors.py

@@ -40,7 +40,7 @@
                 for builder in builders
             )
         ]
-        + [odbc_builders.UBSAN_BUILDER.name, odbc_builders.ASAN_BUILDER.name],
+        + [odbc_builders.UBASAN_BUILDER.name],
     ),
 ]
 

master-migration/master.cfg

@@ -309,18 +309,14 @@ for arch, builders in conc_odbc_builders.RELEASE_BUILDERS_BY_ARCH.items():
             )
         )
 
-# Connector/ODBC ASAN/UBSAN builders
-for b in [
-    conc_odbc_builders.ASAN_BUILDER,
-    conc_odbc_builders.UBSAN_BUILDER,
-]:
-    c["builders"].append(
-        b.get_config(
-            workers=CONNECTORS_WORKERS_BY_ARCH.get("amd64", []),
-            tags=["connector", "odbc", "sanitizer"],
-            jobs=1,
-        )
+# Connector/ODBC ASAN/UBSAN builder
+c["builders"].append(
+    conc_odbc_builders.UBASAN_BUILDER.get_config(
+        workers=CONNECTORS_WORKERS_BY_ARCH.get("amd64", []),
+        tags=["connector", "odbc", "sanitizer", "asan", "ubsan", "clang"],
+        jobs=1,
     )
+)
 
 ## ------------------------------------------------------------------- ##
 ##                             REPORTERS                               ##