MDBF-1185 msan/ubsan/asan with clang 22

Here we phase in clang 22 as a msan and ubasan builder.

If all goes well, we'll remove clang-20 out.

Author: grooverdan

constants.py

@@ -125,6 +125,7 @@
     "amd64-fedora-40-valgrind",
     "amd64-freebsd-14",
     "amd64-msan-clang-20",
+    "amd64-msan-clang-22",
     "amd64-openeuler-2403",
     "amd64-openssl3-fips",
     "amd64-rhel-7",
@@ -178,10 +179,13 @@
     "amd64-debian-12-debug-embedded",
     "amd64-fedora-42",
     "amd64-msan-clang-20-debug",
+    "amd64-msan-clang-22-debug",
     "amd64-opensuse-1506",
     "amd64-rhel-10",
     "amd64-ubasan-clang-20",
+    "amd64-ubasan-clang-22",
     "amd64-ubasan-clang-20-debug",
+    "amd64-ubasan-clang-22-debug",
     "amd64-ubuntu-2404",
     "ppc64le-centos-stream10",
     "ppc64le-rhel-10",

master-migration/master.cfg

@@ -145,7 +145,7 @@ c["builders"].append(
 ## ------------------------------------------------------------------- ##
 
 
-def ubasan_builder(name: str, debug: bool) -> GenericBuilder:
+def ubasan_builder(name: str, image: str, debug: bool) -> GenericBuilder:
     tags_ubasan = ("Debian", "clang", "asan", "ubsan", "big")
     jobs = 12
     if debug:
@@ -156,7 +156,7 @@ def ubasan_builder(name: str, debug: bool) -> GenericBuilder:
         sequences=[
             asan_ubsan(
                 jobs=jobs,
-                config=docker_config(image="debian12-msan-clang-20", shm_size="24g"),
+                config=docker_config(image=image, shm_size="24g"),
                 isDebugBuildType=debug,
             )
         ],
@@ -167,11 +167,18 @@ def ubasan_builder(name: str, debug: bool) -> GenericBuilder:
     )
 
 
-for builder in ["amd64-ubasan-clang-20", "amd64-ubasan-clang-20-debug"]:
-    c["builders"].append(ubasan_builder(name=builder, debug=builder.endswith("debug")))
+for builder, image in [
+    ("amd64-ubasan-clang-20", "debian12-msan-clang-20"),
+    ("amd64-ubasan-clang-20-debug", "debian12-msan-clang-20"),
+    ("amd64-ubasan-clang-22", "debian13-msan-clang-22"),
+    ("amd64-ubasan-clang-22-debug", "debian13-msan-clang-22"),
+]:
+    c["builders"].append(
+        ubasan_builder(name=builder, image=image, debug=builder.endswith("debug"))
+    )
 
 
-def msan_builder(name: str, debug: bool) -> GenericBuilder:
+def msan_builder(name: str, image: str, debug: bool) -> GenericBuilder:
     tags_msan = ("Debian", "clang", "msan", "big")
     jobs = 12
     if debug:
@@ -183,7 +190,7 @@ def msan_builder(name: str, debug: bool) -> GenericBuilder:
         sequences=[
             msan(
                 jobs=jobs,
-                config=docker_config(image="debian12-msan-clang-20", shm_size="24g"),
+                config=docker_config(image=image, shm_size="24g"),
                 isDebugBuildType=debug,
             )
         ],
@@ -194,8 +201,14 @@ def msan_builder(name: str, debug: bool) -> GenericBuilder:
     )
 
 
-builder = "amd64-msan-clang-20-debug"
-c["builders"].append(msan_builder(name=builder, debug=builder.endswith("debug")))
+for builder, image in [
+    ("amd64-msan-clang-20-debug", "debian12-msan-clang-20"),
+    ("amd64-msan-clang-22", "debian13-msan-clang-22"),
+    ("amd64-msan-clang-22", "debian13-msan-clang-22"),
+]:
+    c["builders"].append(
+        msan_builder(name=builder, image=image, debug=builder.endswith("debug"))
+    )
 
 ## ------------------------------------------------------------------- ##
 ##                 MTR EXTENDED COVERAGE BUILDERS                      ##