From 3afd12a3c4c5921bac1a16aed0493f558e84b0c2 Mon Sep 17 00:00:00 2001 From: Vlad Bogolin Date: Thu, 25 Apr 2024 17:37:31 +0300 Subject: [PATCH] Make amd64-debian-11-msan-clang-16 report to GitHub This will replace amd64-debian-11-msan as a branch protection builder, so swapping the hardware used by one with the other. --- constants.py | 1 + master-docker-nonstandard-2/master.cfg | 12 ++++++------ master-docker-nonstandard/master.cfg | 20 ++++++++++---------- 3 files changed, 17 insertions(+), 16 deletions(-) diff --git a/constants.py b/constants.py index 505328dc..0f700fdb 100644 --- a/constants.py +++ b/constants.py @@ -30,6 +30,7 @@ "amd64-debian-10-last-N-failed", "amd64-debian-11-debug-ps-embedded", "amd64-debian-11-msan", + "amd64-debian-11-msan-clang-16", "amd64-fedora-38", "amd64-fedora-38-last-N-failed", "amd64-ubuntu-2004-debug", diff --git a/master-docker-nonstandard-2/master.cfg b/master-docker-nonstandard-2/master.cfg index a4710a02..98179be0 100644 --- a/master-docker-nonstandard-2/master.cfg +++ b/master-docker-nonstandard-2/master.cfg @@ -167,8 +167,8 @@ addWorker( addWorker( "apexis-bbw", 3, - "-msan-clang-16-debian-11", - "quay.io/mariadb-foundation/bb-worker:debian11-msan-clang-16", + "-msan-clang-debian-11", + "quay.io/mariadb-foundation/bb-worker:debian11-msan", jobs=20, save_packages=False, ) @@ -1286,13 +1286,13 @@ c["builders"].append( c["builders"].append( util.BuilderConfig( - name="amd64-debian-11-msan-clang-16", - workernames=workers["x64-bbw-docker-msan-clang-16-debian-11"], - tags=["Debian", "quick", "clang-16", "msan"], + name="amd64-debian-11-msan", + workernames=workers["x64-bbw-docker-msan-clang-debian-11"], + tags=["Debian", "quick", "clang-15", "msan"], collapseRequests=True, nextBuild=nextBuild, canStartBuild=canStartBuild, - properties={"c_compiler": "clang-16", "cxx_compiler": "clang++-16"}, + properties={"c_compiler": "clang-15", "cxx_compiler": "clang++-15"}, locks=getLocks, factory=f_msan_build, ) diff --git a/master-docker-nonstandard/master.cfg b/master-docker-nonstandard/master.cfg index 9422a83b..0b73552c 100644 --- a/master-docker-nonstandard/master.cfg +++ b/master-docker-nonstandard/master.cfg @@ -328,24 +328,24 @@ addWorker( addWorker( "hz-bbw", 1, - "-msan-clang-debian-11", - "quay.io/mariadb-foundation/bb-worker:debian11-msan", + "-msan-clang-16-debian-11", + "quay.io/mariadb-foundation/bb-worker:debian11-msan-clang-16", jobs=20, save_packages=False, ) addWorker( "hz-bbw", 4, - "-msan-clang-debian-11", - "quay.io/mariadb-foundation/bb-worker:debian11-msan", + "-msan-clang-16-debian-11", + "quay.io/mariadb-foundation/bb-worker:debian11-msan-clang-16", jobs=20, save_packages=False, ) addWorker( "hz-bbw", 5, - "-msan-clang-debian-11", - "quay.io/mariadb-foundation/bb-worker:debian11-msan", + "-msan-clang-16-debian-11", + "quay.io/mariadb-foundation/bb-worker:debian11-msan-clang-16", jobs=30, save_packages=False, ) @@ -1679,13 +1679,13 @@ c["builders"].append( c["builders"].append( util.BuilderConfig( - name="amd64-debian-11-msan", - workernames=workers["x64-bbw-docker-msan-clang-debian-11"], - tags=["Debian", "quick", "clang-15", "msan", "protected"], + name="amd64-debian-11-msan-clang-16", + workernames=workers["x64-bbw-docker-msan-clang-16-debian-11"], + tags=["Debian", "quick", "clang-16", "msan", "protected"], collapseRequests=True, nextBuild=nextBuild, canStartBuild=canStartBuild, - properties={"c_compiler": "clang-15", "cxx_compiler": "clang++-15"}, + properties={"c_compiler": "clang-16", "cxx_compiler": "clang++-16"}, locks=getLocks, factory=f_msan_build, )