From 60833e5dbeb2869dc6ba144e281bc6b17a6d9930 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= Date: Thu, 15 Aug 2024 19:54:58 +0200 Subject: [PATCH 1/3] For TSAN builds, use libraries from /opt/tsan The new TSAN images, the TSAN-enabled images install libraries to /opt/tsan, synchronize the configure options and CFLAGS between gcc:tsan and clang:tsan images and set the PKG_CONFIG_PATH to /opt/tsan/lib. (cherry picked from commit 2a46396f295146b3868d89c8d8136fd3574579e5) --- .gitlab-ci.yml | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c64bcf7b7c..8c8d05598b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1204,9 +1204,11 @@ unit:clang:asan: gcc:tsan: variables: CC: gcc - CFLAGS: "${CFLAGS_COMMON} -Wno-stringop-overread -ggdb -O2 -fsanitize=thread -Wl,-rpath=/usr/local/lib -Wl,--enable-new-dtags" + CFLAGS: "${CFLAGS_COMMON} -Wno-stringop-overread -ggdb -O2 -fsanitize=thread" LDFLAGS: "-fsanitize=thread" - EXTRA_CONFIGURE: "--with-libidn2 --enable-pthread-rwlock --without-jemalloc PKG_CONFIG_PATH=/usr/local/lib/pkgconfig" + OPENSSL_CFLAGS: -I/opt/tsan/include + OPENSSL_LIBS: -L/opt/tsan/lib -lssl -lcrypto + EXTRA_CONFIGURE: "--with-libidn2 --enable-pthread-rwlock --without-jemalloc PKG_CONFIG_PATH=/opt/tsan/lib/pkgconfig" <<: *tsan_fedora_40_amd64_image <<: *build_job @@ -1233,9 +1235,11 @@ clang:tsan: <<: *build_job variables: CC: "${CLANG}" - CFLAGS: "${CFLAGS_COMMON} -fsanitize=thread" + CFLAGS: "${CFLAGS_COMMON} -ggdb -O2 -fsanitize=thread" LDFLAGS: "-fsanitize=thread" - EXTRA_CONFIGURE: "--with-libidn2 --enable-pthread-rwlock --without-jemalloc" + OPENSSL_CFLAGS: -I/opt/tsan/include + OPENSSL_LIBS: -L/opt/tsan/lib -lssl -lcrypto + EXTRA_CONFIGURE: "--with-libidn2 --enable-pthread-rwlock --without-jemalloc PKG_CONFIG_PATH=/opt/tsan/lib/pkgconfig" system:clang:tsan: variables: @@ -1577,7 +1581,9 @@ respdiff:tsan: CC: gcc CFLAGS: "${CFLAGS_COMMON} -Og -fsanitize=thread" LDFLAGS: "-fsanitize=thread" - EXTRA_CONFIGURE: "--disable-dnsrps --enable-pthread-rwlock --without-jemalloc" + OPENSSL_CFLAGS: -I/opt/tsan/include + OPENSSL_LIBS: -L/opt/tsan/lib -lssl -lcrypto + EXTRA_CONFIGURE: "--disable-dnsrps --enable-pthread-rwlock --without-jemalloc PKG_CONFIG_PATH=/opt/tsan/lib/pkgconfig" MAX_DISAGREEMENTS_PERCENTAGE: "0.5" TSAN_OPTIONS: "${TSAN_OPTIONS_DEBIAN}" script: From c95a3600e9413987fcb1d55aa4d536135b1bad99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= Date: Thu, 15 Aug 2024 20:21:46 +0200 Subject: [PATCH 2/3] Remove Debian bullseye jobs The Debian bullseye has reached end-of-life, remove it from the CI. (cherry picked from commit d02d6af2b9ac6e74c433c01d63e37c87e14b254e) --- .gitlab-ci.yml | 56 -------------------------------------------------- 1 file changed, 56 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8c8d05598b..eb21f39f69 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -143,10 +143,6 @@ stages: # Debian -.debian-bullseye-amd64: &debian_bullseye_amd64_image - image: "$CI_REGISTRY_IMAGE:debian-bullseye-amd64" - <<: *linux_amd64 - .debian-bookworm-amd64: &debian_bookworm_amd64_image image: "$CI_REGISTRY_IMAGE:debian-bookworm-amd64" <<: *linux_amd64 @@ -1259,58 +1255,6 @@ unit:clang:tsan: - job: clang:tsan artifacts: true -# Jobs for Debian 11 "bullseye" (amd64) - -clang:bullseye:amd64: - variables: - CC: ${CLANG} - CFLAGS: "${CFLAGS_COMMON} -Wenum-conversion" - <<: *debian_bullseye_amd64_image - <<: *build_job - -system:clang:bullseye:amd64: - <<: *debian_bullseye_amd64_image - <<: *system_test_job - needs: - - job: clang:bullseye:amd64 - artifacts: true - -unit:clang:bullseye:amd64: - <<: *debian_bullseye_amd64_image - <<: *unit_test_job - needs: - - job: clang:bullseye:amd64 - artifacts: true - -gcc:bullseye:amd64: - variables: - CC: gcc - CFLAGS: "${CFLAGS_COMMON}" - # See https://gitlab.isc.org/isc-projects/bind9/-/issues/3444 - EXTRA_CONFIGURE: "--with-libidn2 --without-jemalloc" - <<: *debian_bullseye_amd64_image - <<: *build_job - -system:gcc:bullseye:amd64: - # Set up environment variables that allow the "keyfromlabel" system test to be run - variables: - DEFAULT_OPENSSL_CONF: "/etc/ssl/openssl.cnf" - OPENSSL_CONF: "/var/tmp/etc/openssl.cnf" - SOFTHSM2_CONF: "/var/tmp/softhsm2/softhsm2.conf" - SOFTHSM2_MODULE: "/usr/lib/softhsm/libsofthsm2.so" - <<: *debian_bullseye_amd64_image - <<: *system_test_job - needs: - - job: gcc:bullseye:amd64 - artifacts: true - -unit:gcc:bullseye:amd64: - <<: *debian_bullseye_amd64_image - <<: *unit_test_job - needs: - - job: gcc:bullseye:amd64 - artifacts: true - # Jobs for Clang builds on Debian 12 "bookworm" (amd64) clang:bookworm:amd64: From 0bfdc2d55ae3d8b9d402cf45ae2f92631ddd7477 Mon Sep 17 00:00:00 2001 From: Michal Nowak Date: Fri, 16 Aug 2024 08:31:51 +0200 Subject: [PATCH 3/3] Retire Debian 11 "bullseye" A follow-up to isc-projects/bind9!9324. --- doc/arm/platforms.inc.rst | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/doc/arm/platforms.inc.rst b/doc/arm/platforms.inc.rst index 942d07e7e7..7be112dbb4 100644 --- a/doc/arm/platforms.inc.rst +++ b/doc/arm/platforms.inc.rst @@ -45,7 +45,7 @@ Regularly Tested Platforms Current versions of BIND 9 are fully supported and regularly tested on the following systems: -- Debian 11, 12 +- Debian 12 - Ubuntu LTS 20.04, 22.04, 24.04 - Fedora 40 - Red Hat Enterprise Linux / CentOS / Oracle Linux 7, 8, 9 @@ -91,6 +91,9 @@ supported platforms. - Ubuntu 14.04, 16.04 (Ubuntu ESM releases are not supported) - CentOS 6 + - Debian 8 Jessie, 9 Stretch, 10 Buster, 11 Bullseye + - Ubuntu 14.04, 16.04, 18.04 (Ubuntu ESM releases are not supported) + - Red Hat Enterprise Linux / CentOS / Oracle Linux 6, 7 - Debian 8 Jessie, 9 Stretch, 10 Buster - FreeBSD 10.x, 11.x