mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-29 13:38:26 +00:00
Code Issues Releases Wiki Activity

Make Debian 12 "bookworm" the base image

Browse Source 
Just replace "bullseye" with "bookworm" and reintroduce Debian 11
"bullseye" later.
This commit is contained in:
Michal Nowak 2023-07-24 16:19:33 +02:00
parent a5884c2c1d
commit 2d18c57c54
No known key found for this signature in database
4 changed files with 48 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
.gitlab-ci.yml
View File

@ -150,20 +150,20 @@ stages:
# Debian # Debian
.respdiff-debian-bullseye-amd64: &respdiff_debian_bullseye_amd64_image .respdiff-debian-bookworm-amd64: &respdiff_debian_bookworm_amd64_image
image: "$CI_REGISTRY_IMAGE:debian-bullseye-amd64" image: "$CI_REGISTRY_IMAGE:debian-bookworm-amd64"
<<: *linux_respdiff_amd64 <<: *linux_respdiff_amd64
.debian-bullseye-amd64: &debian_bullseye_amd64_image .debian-bookworm-amd64: &debian_bookworm_amd64_image
image: "$CI_REGISTRY_IMAGE:debian-bullseye-amd64" image: "$CI_REGISTRY_IMAGE:debian-bookworm-amd64"
<<: *linux_amd64 <<: *linux_amd64
.tsan-debian-bullseye-amd64: &tsan_debian_bullseye_amd64_image .tsan-debian-bookworm-amd64: &tsan_debian_bookworm_amd64_image
image: "$CI_REGISTRY_IMAGE:tsan-debian-bullseye-amd64" image: "$CI_REGISTRY_IMAGE:tsan-debian-bookworm-amd64"
<<: *linux_amd64 <<: *linux_amd64
.debian-bullseye-amd64cross32: &debian_bullseye_amd64cross32_image .debian-bookworm-amd64cross32: &debian_bookworm_amd64cross32_image
image: "$CI_REGISTRY_IMAGE:debian-bullseye-amd64cross32" image: "$CI_REGISTRY_IMAGE:debian-bookworm-amd64cross32"
<<: *linux_amd64 <<: *linux_amd64
.debian-sid-amd64: &debian_sid_amd64_image .debian-sid-amd64: &debian_sid_amd64_image
@ -204,7 +204,7 @@ stages:
# This is a meta image that is used as a base for non-specific jobs # This is a meta image that is used as a base for non-specific jobs
.base: &base_image .base: &base_image
<<: *debian_bullseye_amd64_image <<: *debian_bookworm_amd64_image
### QCOW2 Image Templates ### QCOW2 Image Templates
@ -627,7 +627,7 @@ tarball-create:
- job: autoreconf - job: autoreconf
artifacts: true artifacts: true
# Jobs for doc builds on Debian 11 "bullseye" (amd64) # Jobs for doc builds on Debian 12 "bookworm" (amd64)
docs: docs:
<<: *default_triggering_rules <<: *default_triggering_rules
@ -788,48 +788,48 @@ gcc:tarball:nosphinx:
- job: tarball-create - job: tarball-create
artifacts: true artifacts: true
# Jobs for regular GCC builds on Debian 11 "bullseye" (amd64) # Jobs for regular GCC builds on Debian 12 "bookworm" (amd64)
gcc:bullseye:amd64: gcc:bookworm:amd64:
variables: variables:
BUILD_CONTRIB: 1 BUILD_CONTRIB: 1
CC: gcc CC: gcc
CFLAGS: "${CFLAGS_COMMON} --coverage -O0" CFLAGS: "${CFLAGS_COMMON} --coverage -O0"
EXTRA_CONFIGURE: "--with-libidn2 ${WITH_READLINE_LIBEDIT}" EXTRA_CONFIGURE: "--with-libidn2 ${WITH_READLINE_LIBEDIT}"
RUN_MAKE_INSTALL: 1 RUN_MAKE_INSTALL: 1
<<: *debian_bullseye_amd64_image <<: *debian_bookworm_amd64_image
<<: *build_job <<: *build_job
system:gcc:bullseye:amd64: system:gcc:bookworm:amd64:
<<: *debian_bullseye_amd64_image <<: *debian_bookworm_amd64_image
<<: *system_test_gcov_job <<: *system_test_gcov_job
variables: variables:
CI_ENABLE_ALL_TESTS: 1 CI_ENABLE_ALL_TESTS: 1
needs: needs:
- job: unit:gcc:bullseye:amd64 - job: unit:gcc:bookworm:amd64
artifacts: true artifacts: true
unit:gcc:bullseye:amd64: unit:gcc:bookworm:amd64:
<<: *debian_bullseye_amd64_image <<: *debian_bookworm_amd64_image
<<: *unit_test_gcov_job <<: *unit_test_gcov_job
variables: variables:
CI_ENABLE_ALL_TESTS: 1 CI_ENABLE_ALL_TESTS: 1
needs: needs:
- job: gcc:bullseye:amd64 - job: gcc:bookworm:amd64
artifacts: true artifacts: true
# Build job for cross-compiled GCC builds on 64-bit Debian 11 "bullseye" # Build job for cross-compiled GCC builds on 64-bit Debian 12 "bookworm"
# (amd64) with 32-bit BIND 9. # (amd64) with 32-bit BIND 9.
gcc:bullseye:amd64cross32: gcc:bookworm:amd64cross32:
variables: variables:
CFLAGS: "${CFLAGS_COMMON}" CFLAGS: "${CFLAGS_COMMON}"
CROSS_COMPILATION: 1 CROSS_COMPILATION: 1
EXTRA_CONFIGURE: "--build=x86_64-linux-gnu --host=i686-linux-gnu --with-libidn2 ${WITH_READLINE_LIBEDIT}" EXTRA_CONFIGURE: "--build=x86_64-linux-gnu --host=i686-linux-gnu --with-libidn2 ${WITH_READLINE_LIBEDIT}"
<<: *debian_bullseye_amd64cross32_image <<: *debian_bookworm_amd64cross32_image
<<: *build_job <<: *build_job
# Jobs for scan-build builds on Debian 11 "bullseye" (amd64) # Jobs for scan-build builds on Debian 12 "bookworm" (amd64)
.scan_build: &scan_build .scan_build: &scan_build
- ${SCAN_BUILD} --html-title="BIND 9 ($CI_COMMIT_SHORT_SHA)" - ${SCAN_BUILD} --html-title="BIND 9 ($CI_COMMIT_SHORT_SHA)"
@ -915,7 +915,7 @@ unit:gcc:sid:amd64:
- job: gcc:sid:amd64 - job: gcc:sid:amd64
artifacts: true artifacts: true
# Job for out-of-tree GCC build on Debian 11 "bullseye" (amd64) # Job for out-of-tree GCC build on Debian 12 "bookworm" (amd64)
# Also tests configration option: --with-lmdb. # Also tests configration option: --with-lmdb.
gcc:out-of-tree: gcc:out-of-tree:
@ -949,7 +949,7 @@ unit:gcc:out-of-tree:
<<: *unit_test_job <<: *unit_test_job
<<: *api_schedules_tags_triggers_web_triggering_rules <<: *api_schedules_tags_triggers_web_triggering_rules
# Jobs for tarball GCC builds on Debian 11 "bullseye" (amd64) # Jobs for tarball GCC builds on Debian 12 "bookworm" (amd64)
gcc:tarball: gcc:tarball:
variables: variables:
@ -1148,7 +1148,7 @@ unit:gcc:tsan:
artifacts: true artifacts: true
clang:tsan: clang:tsan:
<<: *tsan_debian_bullseye_amd64_image <<: *tsan_debian_bookworm_amd64_image
<<: *build_job <<: *build_job
variables: variables:
CC: "${CLANG}" CC: "${CLANG}"
@ -1159,7 +1159,7 @@ clang:tsan:
system:clang:tsan: system:clang:tsan:
variables: variables:
TSAN_OPTIONS: "${TSAN_OPTIONS_DEBIAN}" TSAN_OPTIONS: "${TSAN_OPTIONS_DEBIAN}"
<<: *tsan_debian_bullseye_amd64_image <<: *tsan_debian_bookworm_amd64_image
<<: *system_test_tsan_job <<: *system_test_tsan_job
needs: needs:
- job: clang:tsan - job: clang:tsan
@ -1168,17 +1168,17 @@ system:clang:tsan:
unit:clang:tsan: unit:clang:tsan:
variables: variables:
TSAN_OPTIONS: "${TSAN_OPTIONS_DEBIAN}" TSAN_OPTIONS: "${TSAN_OPTIONS_DEBIAN}"
<<: *tsan_debian_bullseye_amd64_image <<: *tsan_debian_bookworm_amd64_image
<<: *unit_test_tsan_job <<: *unit_test_tsan_job
needs: needs:
- job: clang:tsan - job: clang:tsan
artifacts: true artifacts: true
# Jobs for Clang builds on Debian 11 "bullseye" (amd64) # Jobs for Clang builds on Debian 12 "bookworm" (amd64)
# The -Wno-compound-token-split-by-macro option prevents warning when compiling # The -Wno-compound-token-split-by-macro option prevents warning when compiling
# Perl DLZ module with Clang against Perl older than version 5.35.2. # Perl DLZ module with Clang against Perl older than version 5.35.2.
clang:bullseye:amd64: clang:bookworm:amd64:
variables: variables:
BUILD_CONTRIB: 1 BUILD_CONTRIB: 1
CC: ${CLANG} CC: ${CLANG}
@ -1186,27 +1186,27 @@ clang:bullseye:amd64:
# See https://gitlab.isc.org/isc-projects/bind9/-/issues/3444 # See https://gitlab.isc.org/isc-projects/bind9/-/issues/3444
EXTRA_CONFIGURE: "--without-jemalloc --disable-leak-detection" EXTRA_CONFIGURE: "--without-jemalloc --disable-leak-detection"
RUN_MAKE_INSTALL: 1 RUN_MAKE_INSTALL: 1
<<: *debian_bullseye_amd64_image <<: *debian_bookworm_amd64_image
<<: *build_job <<: *build_job
system:clang:bullseye:amd64: system:clang:bookworm:amd64:
# Set up environment variables that allow the "keyfromlabel" system test to be run # Set up environment variables that allow the "keyfromlabel" system test to be run
variables: variables:
DEFAULT_OPENSSL_CONF: "/etc/ssl/openssl.cnf" DEFAULT_OPENSSL_CONF: "/etc/ssl/openssl.cnf"
OPENSSL_CONF: "/var/tmp/etc/openssl.cnf" OPENSSL_CONF: "/var/tmp/etc/openssl.cnf"
SOFTHSM2_CONF: "/var/tmp/softhsm2/softhsm2.conf" SOFTHSM2_CONF: "/var/tmp/softhsm2/softhsm2.conf"
SOFTHSM2_MODULE: "/usr/lib/softhsm/libsofthsm2.so" SOFTHSM2_MODULE: "/usr/lib/softhsm/libsofthsm2.so"
<<: *debian_bullseye_amd64_image <<: *debian_bookworm_amd64_image
<<: *system_test_job <<: *system_test_job
needs: needs:
- job: clang:bullseye:amd64 - job: clang:bookworm:amd64
artifacts: true artifacts: true
unit:clang:bullseye:amd64: unit:clang:bookworm:amd64:
<<: *debian_bullseye_amd64_image <<: *debian_bookworm_amd64_image
<<: *unit_test_job <<: *unit_test_job
needs: needs:
- job: clang:bullseye:amd64 - job: clang:bookworm:amd64
artifacts: true artifacts: true
# Jobs for Clang builds on FreeBSD 12 (amd64) # Jobs for Clang builds on FreeBSD 12 (amd64)
@ -1382,7 +1382,7 @@ coverity:
respdiff-short: respdiff-short:
<<: *respdiff_job <<: *respdiff_job
<<: *default_triggering_rules <<: *default_triggering_rules
<<: *debian_bullseye_amd64_image <<: *debian_bookworm_amd64_image
variables: variables:
CC: gcc CC: gcc
CFLAGS: "${CFLAGS_COMMON} -Og -DISC_TRACK_PTHREADS_OBJECTS" CFLAGS: "${CFLAGS_COMMON} -Og -DISC_TRACK_PTHREADS_OBJECTS"
@ -1393,7 +1393,7 @@ respdiff-short:
respdiff-short:asan: respdiff-short:asan:
<<: *respdiff_job <<: *respdiff_job
<<: *default_triggering_rules <<: *default_triggering_rules
<<: *debian_bullseye_amd64_image <<: *debian_bookworm_amd64_image
variables: variables:
CC: gcc CC: gcc
CFLAGS: "${CFLAGS_COMMON} -Og -fsanitize=address,undefined" CFLAGS: "${CFLAGS_COMMON} -Og -fsanitize=address,undefined"
@ -1406,7 +1406,7 @@ respdiff-short:asan:
respdiff-short:tsan: respdiff-short:tsan:
<<: *respdiff_job <<: *respdiff_job
<<: *default_triggering_rules <<: *default_triggering_rules
<<: *tsan_debian_bullseye_amd64_image <<: *tsan_debian_bookworm_amd64_image
variables: variables:
CC: gcc CC: gcc
CFLAGS: "${CFLAGS_COMMON} -Og -fsanitize=thread" CFLAGS: "${CFLAGS_COMMON} -Og -fsanitize=thread"
@ -1423,7 +1423,7 @@ respdiff-short:tsan:
respdiff-long: respdiff-long:
<<: *respdiff_job <<: *respdiff_job
<<: *api_schedules_tags_triggers_web_triggering_rules <<: *api_schedules_tags_triggers_web_triggering_rules
<<: *respdiff_debian_bullseye_amd64_image <<: *respdiff_debian_bookworm_amd64_image
variables: variables:
CC: gcc CC: gcc
CFLAGS: "${CFLAGS_COMMON} -Og -DISC_TRACK_PTHREADS_OBJECTS" CFLAGS: "${CFLAGS_COMMON} -Og -DISC_TRACK_PTHREADS_OBJECTS"
@ -1434,7 +1434,7 @@ respdiff-long:
respdiff-long:asan: respdiff-long:asan:
<<: *respdiff_job <<: *respdiff_job
<<: *api_schedules_tags_triggers_web_triggering_rules <<: *api_schedules_tags_triggers_web_triggering_rules
<<: *debian_bullseye_amd64_image <<: *debian_bookworm_amd64_image
variables: variables:
CC: gcc CC: gcc
CFLAGS: "${CFLAGS_COMMON} -Og -fsanitize=address,undefined" CFLAGS: "${CFLAGS_COMMON} -Og -fsanitize=address,undefined"
@ -1447,7 +1447,7 @@ respdiff-long:asan:
respdiff-long:tsan: respdiff-long:tsan:
<<: *respdiff_job <<: *respdiff_job
<<: *api_schedules_tags_triggers_web_triggering_rules <<: *api_schedules_tags_triggers_web_triggering_rules
<<: *tsan_debian_bullseye_amd64_image <<: *tsan_debian_bookworm_amd64_image
variables: variables:
CC: gcc CC: gcc
CFLAGS: "${CFLAGS_COMMON} -Og -fsanitize=thread" CFLAGS: "${CFLAGS_COMMON} -Og -fsanitize=thread"
@ -1464,7 +1464,7 @@ respdiff-long:tsan:
respdiff-long-third-party: respdiff-long-third-party:
<<: *respdiff_job <<: *respdiff_job
<<: *api_schedules_tags_triggers_web_triggering_rules <<: *api_schedules_tags_triggers_web_triggering_rules
<<: *debian_bullseye_amd64_image <<: *debian_bookworm_amd64_image
variables: variables:
CC: gcc CC: gcc
CFLAGS: "${CFLAGS_COMMON} -Og" CFLAGS: "${CFLAGS_COMMON} -Og"
@ -1653,7 +1653,7 @@ gcov:
<<: *default_triggering_rules <<: *default_triggering_rules
stage: postcheck stage: postcheck
needs: needs:
- job: system:gcc:bullseye:amd64 - job: system:gcc:bookworm:amd64
artifacts: true artifacts: true
script: script:
# *.gcno and *.gcda files generated for shared library objects are created # *.gcno and *.gcda files generated for shared library objects are created

2
doc/arm/platforms.inc.rst
View File

@ -43,7 +43,7 @@ Regularly Tested Platforms
Current versions of BIND 9 are fully supported and regularly tested on the Current versions of BIND 9 are fully supported and regularly tested on the
following systems: following systems:
- Debian 11 - Debian 12
- Ubuntu LTS 20.04, 22.04 - Ubuntu LTS 20.04, 22.04
- Fedora 38 - Fedora 38
- Red Hat Enterprise Linux / CentOS / Oracle Linux 8, 9 - Red Hat Enterprise Linux / CentOS / Oracle Linux 8, 9

2
doc/arm/requirements.txt
View File

@ -1,5 +1,5 @@
# Make Read the Docs use the exact same package versions as in # Make Read the Docs use the exact same package versions as in
# registry.gitlab.isc.org/isc-projects/images/bind9:debian-bullseye-amd64 # registry.gitlab.isc.org/isc-projects/images/bind9:debian-bookworm-amd64
Sphinx==6.1.3 Sphinx==6.1.3
docutils==0.18.1 docutils==0.18.1
sphinx_rtd_theme==1.2.0 sphinx_rtd_theme==1.2.0

2
util/release-tarball-comparison.sh
View File

@ -34,7 +34,7 @@ if [ -z "${GITLAB_USER}" ] || [ -z "${GITLAB_TOKEN}" ]; then
fi fi
# Create the container to work in. # Create the container to work in.
CONTAINER_ID=$(docker create --interactive debian:bullseye) CONTAINER_ID=$(docker create --interactive debian:bookworm)
trap "docker container rm -f \${CONTAINER_ID} >/dev/null" EXIT trap "docker container rm -f \${CONTAINER_ID} >/dev/null" EXIT
docker start "${CONTAINER_ID}" docker start "${CONTAINER_ID}"