From: Michal Nowak Date: Tue, 5 Aug 2025 16:23:10 +0000 (+0200) Subject: Make "trixie" the base image X-Git-Tag: v9.21.12~13^2~2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bb26409f343418989f7ae27eac19b61d17c969cf;p=thirdparty%2Fbind9.git Make "trixie" the base image --- diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5c456ecb6e7..4a50dca3aac 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -223,12 +223,12 @@ stages: image: "$CI_REGISTRY_IMAGE:debian-trixie-amd64" <<: *linux_amd64 -.tsan-debian-bookworm-amd64: &tsan_debian_bookworm_amd64_image - image: "$CI_REGISTRY_IMAGE:tsan-debian-bookworm-amd64" +.tsan-debian-trixie-amd64: &tsan_debian_trixie_amd64_image + image: "$CI_REGISTRY_IMAGE:tsan-debian-trixie-amd64" <<: *linux_amd64 -.debian-bookworm-amd64cross32: &debian_bookworm_amd64cross32_image - image: "$CI_REGISTRY_IMAGE:debian-bookworm-amd64cross32" +.debian-trixie-amd64cross32: &debian_trixie_amd64cross32_image + image: "$CI_REGISTRY_IMAGE:debian-trixie-amd64cross32" <<: *linux_amd64 .debian-sid-amd64: &debian_sid_amd64_image @@ -269,7 +269,7 @@ stages: # This is a meta image that is used as a base for non-specific jobs .base: &base_image - <<: *debian_bookworm_amd64_image + <<: *debian_trixie_amd64_image ### Job Templates @@ -615,26 +615,14 @@ clang-format: when: on_failure coccinelle: - ###################################################################### - # Revert to using the "precheck_job" anchor after the "base" image is - # upgraded to Debian trixie, which has Coccinelle 1.2. - <<: *default_triggering_rules - <<: *debian_trixie_amd64_image - stage: precheck - ###################################################################### + <<: *precheck_job needs: [] script: - util/check-cocci - if test "$(git status --porcelain | grep -Ev '\?\?' | wc -l)" -gt "0"; then git status --short; exit 1; fi meson-format: - ###################################################################### - # Revert to using the "precheck_job" anchor after the "base" image is - # upgraded to Debian trixie, which has muon 0.4.0. - <<: *default_triggering_rules - <<: *debian_trixie_amd64_image - stage: precheck - ###################################################################### + <<: *precheck_job needs: [] script: - git ls-files "*meson.build" | xargs muon-meson fmt -i @@ -662,9 +650,7 @@ doctest: "$PYTEST" --noconftest --doctest-modules pylint: - <<: *default_triggering_rules - <<: *debian_trixie_amd64_image - stage: precheck + <<: *precheck_job needs: [] variables: PYTHONPATH: "${CI_PROJECT_DIR}/bin/tests/system" @@ -711,8 +697,7 @@ checkbashisms: - checkbashisms $(find . -path './.git' -prune -o -type f -exec sh -c 'head -n 1 "{}" | grep -qsF "#!/bin/sh"' \; -print) mypy: - <<: *default_triggering_rules - <<: *debian_trixie_amd64_image + <<: *precheck_job stage: precheck script: - mypy "bin/tests/system/isctest/" @@ -731,7 +716,7 @@ tarball-create: - build/meson-dist/*.tar.xz needs: [] -# Jobs for doc builds on Debian 12 "bookworm" (amd64) +# Jobs for doc builds on Debian 13 "trixie" (amd64) changelog: <<: *base_image @@ -1050,34 +1035,20 @@ gcc:bookworm:amd64: variables: CC: gcc CFLAGS: "${CFLAGS_COMMON}" - # Tracing needs to be disabled otherwise gcovr fails - EXTRA_CONFIGURE: "-Doptimization=0 -Db_coverage=true -Dtracing=disabled -Didn=enabled ${WITH_LIBEDIT}" - RUN_MESON_INSTALL: 1 + EXTRA_CONFIGURE: "-Didn=enabled" <<: *debian_bookworm_amd64_image <<: *build_job system:gcc:bookworm:amd64: <<: *debian_bookworm_amd64_image <<: *system_test_job - variables: - CI_ENABLE_LONG_TESTS: 1 - CLEAN_BUILD_ARTIFACTS_ON_SUCCESS: 0 - TZ: Australia/Sydney - needs: # using artifacts from unit test job is required for gcov - - job: unit:gcc:bookworm:amd64 + needs: + - job: gcc:bookworm:amd64 artifacts: true - rules: - - if: '$CI_PIPELINE_SOURCE == "schedule"' - variables: - CI_ENABLE_LIVE_INTERENT_TESTS: 1 - - *default_triggering_rules_list unit:gcc:bookworm:amd64: <<: *debian_bookworm_amd64_image <<: *unit_test_job - variables: - CI_ENABLE_LONG_TESTS: 1 - CLEAN_BUILD_ARTIFACTS_ON_SUCCESS: 0 needs: - job: gcc:bookworm:amd64 artifacts: true @@ -1088,7 +1059,8 @@ gcc:trixie:amd64: variables: CC: gcc CFLAGS: "${CFLAGS_COMMON}" - EXTRA_CONFIGURE: "-Didn=enabled" + # Tracing needs to be disabled otherwise gcovr fails + EXTRA_CONFIGURE: "-Doptimization=0 -Db_coverage=true -Dtracing=disabled -Didn=enabled ${WITH_LIBEDIT}" RUN_MESON_INSTALL: 1 <<: *debian_trixie_amd64_image <<: *build_job @@ -1096,29 +1068,42 @@ gcc:trixie:amd64: system:gcc:trixie:amd64: <<: *debian_trixie_amd64_image <<: *system_test_job + variables: + CI_ENABLE_LONG_TESTS: 1 + CLEAN_BUILD_ARTIFACTS_ON_SUCCESS: 0 + TZ: Australia/Sydney + # using artifacts from unit test job is required for gcov needs: - - job: gcc:trixie:amd64 + - job: unit:gcc:trixie:amd64 artifacts: true + rules: + - if: '$CI_PIPELINE_SOURCE == "schedule"' + variables: + CI_ENABLE_LIVE_INTERNET_TESTS: 1 + - *default_triggering_rules_list unit:gcc:trixie:amd64: <<: *debian_trixie_amd64_image <<: *unit_test_job + variables: + CI_ENABLE_LONG_TESTS: 1 + CLEAN_BUILD_ARTIFACTS_ON_SUCCESS: 0 needs: - job: gcc:trixie:amd64 artifacts: true -# Build job for cross-compiled GCC builds on 64-bit Debian 12 "bookworm" +# Build job for cross-compiled GCC builds on 64-bit Debian 13 "trixie" # (amd64) with 32-bit BIND 9. -gcc:bookworm:amd64cross32: +gcc:trixie:amd64cross32: variables: CFLAGS: "${CFLAGS_COMMON}" CROSS_COMPILATION: 1 EXTRA_CONFIGURE: "--cross-file ci/amd64cross32.ini -Didn=enabled -Dgssapi=disabled -Dtracing=disabled ${WITH_LIBEDIT}" - <<: *debian_bookworm_amd64cross32_image + <<: *debian_trixie_amd64cross32_image <<: *build_job -# Jobs for scan-build builds on Debian 12 "bookworm" (amd64) +# Jobs for scan-build builds on Debian 13 "trixie" (amd64) .scan_build: &scan_build - ${SCAN_BUILD} --html-title="BIND 9 ($CI_COMMIT_SHORT_SHA)" @@ -1204,7 +1189,7 @@ unit:gcc:sid:amd64: - job: gcc:sid:amd64 artifacts: true -# Jobs for tarball GCC builds on Debian 12 "bookworm" (amd64) +# Jobs for tarball GCC builds on Debian 13 "trixie" (amd64) gcc:tarball: variables: @@ -1401,7 +1386,7 @@ unit:gcc:tsan: artifacts: true clang:tsan: - <<: *tsan_debian_bookworm_amd64_image + <<: *tsan_debian_trixie_amd64_image <<: *build_job variables: CC: "${CLANG}" @@ -1412,7 +1397,7 @@ clang:tsan: system:clang:tsan: variables: TSAN_OPTIONS: "${TSAN_OPTIONS_DEBIAN}" - <<: *tsan_debian_bookworm_amd64_image + <<: *tsan_debian_trixie_amd64_image <<: *system_test_tsan_job needs: - job: clang:tsan @@ -1421,7 +1406,7 @@ system:clang:tsan: unit:clang:tsan: variables: TSAN_OPTIONS: "${TSAN_OPTIONS_DEBIAN}" - <<: *tsan_debian_bookworm_amd64_image + <<: *tsan_debian_trixie_amd64_image <<: *unit_test_tsan_job needs: - job: clang:tsan @@ -1456,34 +1441,6 @@ tsan:stress: - job: clang:tsan artifacts: true -# Jobs for Clang builds on Debian 12 "bookworm" (amd64) - -clang:bookworm:amd64: - variables: - CC: ${CLANG} - CFLAGS: "${CFLAGS_COMMON} -Wenum-conversion -DOPENSSL_API_COMPAT=10100" - # See https://gitlab.isc.org/isc-projects/bind9/-/issues/3444 - EXTRA_CONFIGURE: "-Djemalloc=disabled -Dleak-detection=disabled" - RUN_MESON_INSTALL: 1 - <<: *debian_bookworm_amd64_image - <<: *build_job - -system:clang:bookworm:amd64: - <<: *debian_bookworm_amd64_image - <<: *system_test_job - <<: *api_pipelines_schedules_tags_triggers_web_triggering_rules - needs: - - job: clang:bookworm:amd64 - artifacts: true - -unit:clang:bookworm:amd64: - <<: *debian_bookworm_amd64_image - <<: *unit_test_job - <<: *api_pipelines_schedules_tags_triggers_web_triggering_rules - needs: - - job: clang:bookworm:amd64 - artifacts: true - # Jobs for Clang builds on Debian 13 "trixie" (amd64) clang:trixie:amd64: @@ -1721,7 +1678,7 @@ coverity: respdiff: <<: *respdiff_job <<: *default_triggering_rules - <<: *debian_bookworm_amd64_image + <<: *base_image variables: CC: gcc CFLAGS: "${CFLAGS_COMMON} -DISC_TRACK_PTHREADS_OBJECTS" @@ -1734,7 +1691,7 @@ respdiff: respdiff:asan: <<: *respdiff_job <<: *default_triggering_rules - <<: *debian_bookworm_amd64_image + <<: *base_image variables: CC: gcc CFLAGS: "${CFLAGS_COMMON}" @@ -1747,7 +1704,7 @@ respdiff:asan: respdiff:tsan: <<: *respdiff_job <<: *default_triggering_rules - <<: *tsan_debian_bookworm_amd64_image + <<: *tsan_debian_trixie_amd64_image variables: CC: "${CLANG}" CFLAGS: "${CFLAGS_COMMON}" @@ -1764,7 +1721,7 @@ respdiff:tsan: respdiff-third-party: <<: *respdiff_job <<: *default_triggering_rules - <<: *debian_bookworm_amd64_image + <<: *base_image variables: CC: gcc CFLAGS: "${CFLAGS_COMMON}" @@ -1776,7 +1733,7 @@ respdiff-third-party: .respdiff-recent-named: &respdiff_recent_named <<: *respdiff_job - <<: *debian_bookworm_amd64_image + <<: *base_image <<: *default_triggering_rules needs: - job: ci-variables @@ -1902,7 +1859,7 @@ gcov: <<: *default_triggering_rules stage: postcheck needs: - - job: system:gcc:bookworm:amd64 + - job: system:gcc:trixie:amd64 artifacts: true script: # Ensure gcov files for unit tests are found via tests/ rather than diff --git a/util/release-tarball-comparison.sh b/util/release-tarball-comparison.sh index 1f9267c707c..4fac8f9203a 100755 --- a/util/release-tarball-comparison.sh +++ b/util/release-tarball-comparison.sh @@ -34,7 +34,7 @@ if [ -z "${GITLAB_USER}" ] || [ -z "${GITLAB_TOKEN}" ]; then fi # Create the container to work in. -CONTAINER_ID=$(docker create --interactive debian:bookworm) +CONTAINER_ID=$(docker create --interactive debian:trixie) trap "docker container rm -f \${CONTAINER_ID} >/dev/null" EXIT docker start "${CONTAINER_ID}"