mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-30 14:07:59 +00:00
Code Issues Releases Wiki Activity

Merge branch 'mnowak/make-debian-11-bullseye-base-image' into 'main'

Browse Source 
Make bullseye the base image

See merge request isc-projects/bind9!5367
This commit is contained in:
Michal Nowak
2021-12-23 14:41:45 +00:00
parent 3959776b02 4d7e343813
commit ab52c99843
1 changed files with 46 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
.gitlab-ci.yml
View File

@@ -127,14 +127,14 @@ stages:
image: "$CI_REGISTRY_IMAGE:debian-buster-amd64" image: "$CI_REGISTRY_IMAGE:debian-buster-amd64"
<<: *linux_amd64 <<: *linux_amd64
.debian-buster-amd64cross32: &debian_buster_amd64cross32_image
image: "$CI_REGISTRY_IMAGE:debian-buster-amd64cross32"
<<: *linux_amd64
.debian-bullseye-amd64: &debian_bullseye_amd64_image .debian-bullseye-amd64: &debian_bullseye_amd64_image
image: "$CI_REGISTRY_IMAGE:debian-bullseye-amd64" image: "$CI_REGISTRY_IMAGE:debian-bullseye-amd64"
<<: *linux_amd64 <<: *linux_amd64
.debian-bullseye-amd64cross32: &debian_bullseye_amd64cross32_image
image: "$CI_REGISTRY_IMAGE:debian-bullseye-amd64cross32"
<<: *linux_amd64
.debian-sid-amd64: &debian_sid_amd64_image .debian-sid-amd64: &debian_sid_amd64_image
image: "$CI_REGISTRY_IMAGE:debian-sid-amd64" image: "$CI_REGISTRY_IMAGE:debian-sid-amd64"
<<: *linux_amd64 <<: *linux_amd64
@@ -169,7 +169,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_buster_amd64_image <<: *debian_bullseye_amd64_image
### QCOW2 Image Templates ### QCOW2 Image Templates
@@ -498,7 +498,7 @@ tarball-create:
- job: autoreconf - job: autoreconf
artifacts: true artifacts: true
# Jobs for doc builds on Debian 10 "buster" (amd64) # Jobs for doc builds on Debian 11 "bullseye" (amd64)
docs: docs:
<<: *release_branch_triggering_rules <<: *release_branch_triggering_rules
@@ -638,21 +638,24 @@ unit:gcc:stretch:amd64:
gcc:buster:amd64: gcc:buster:amd64:
variables: variables:
CC: gcc CC: gcc
CFLAGS: "${CFLAGS_COMMON} --coverage -O0" CFLAGS: "${CFLAGS_COMMON}"
EXTRA_CONFIGURE: "--with-libidn2 ${WITH_READLINE_LIBEDIT}" EXTRA_CONFIGURE: "--with-libidn2"
<<: *debian_buster_amd64_image <<: *debian_buster_amd64_image
<<: *build_job <<: *build_job
<<: *schedules_tags_web_triggering_rules
system:gcc:buster:amd64: system:gcc:buster:amd64:
<<: *debian_buster_amd64_image <<: *debian_buster_amd64_image
<<: *system_test_gcov_job <<: *system_test_job
<<: *schedules_tags_web_triggering_rules
needs: needs:
- job: unit:gcc:buster:amd64 - job: gcc:buster:amd64
artifacts: true artifacts: true
unit:gcc:buster:amd64: unit:gcc:buster:amd64:
<<: *debian_buster_amd64_image <<: *debian_buster_amd64_image
<<: *unit_test_gcov_job <<: *unit_test_job
<<: *schedules_tags_web_triggering_rules
needs: needs:
- job: gcc:buster:amd64 - job: gcc:buster:amd64
artifacts: true artifacts: true
@@ -662,51 +665,51 @@ unit:gcc:buster:amd64:
gcc:bullseye:amd64: gcc:bullseye:amd64:
variables: variables:
CC: gcc CC: gcc
CFLAGS: "${CFLAGS_COMMON} -O2" CFLAGS: "${CFLAGS_COMMON} --coverage -O0"
EXTRA_CONFIGURE: "--without-gssapi --with-libidn2" EXTRA_CONFIGURE: "--with-libidn2 ${WITH_READLINE_LIBEDIT}"
<<: *debian_bullseye_amd64_image <<: *debian_bullseye_amd64_image
<<: *build_job <<: *build_job
system:gcc:bullseye:amd64: system:gcc:bullseye:amd64:
<<: *debian_bullseye_amd64_image <<: *debian_bullseye_amd64_image
<<: *system_test_job <<: *system_test_gcov_job
needs: needs:
- job: gcc:bullseye:amd64 - job: unit:gcc:bullseye:amd64
artifacts: true artifacts: true
unit:gcc:bullseye:amd64: unit:gcc:bullseye:amd64:
<<: *debian_bullseye_amd64_image <<: *debian_bullseye_amd64_image
<<: *unit_test_job <<: *unit_test_gcov_job
needs: needs:
- job: gcc:bullseye:amd64 - job: gcc:bullseye:amd64
artifacts: true artifacts: true
# Jobs for cross-compiled GCC builds on Debian 10 "buster" (amd64) with # Jobs for cross-compiled GCC builds on Debian 11 "bullseye" (amd64) with
# 32-bit libraries # 32-bit libraries
gcc:buster:amd64cross32: gcc:bullseye: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_buster_amd64cross32_image <<: *debian_bullseye_amd64cross32_image
<<: *build_job <<: *build_job
system:gcc:buster:amd64cross32: system:gcc:bullseye:amd64cross32:
<<: *debian_buster_amd64cross32_image <<: *debian_bullseye_amd64cross32_image
<<: *system_test_job <<: *system_test_job
needs: needs:
- job: gcc:buster:amd64cross32 - job: gcc:bullseye:amd64cross32
artifacts: true artifacts: true
unit:gcc:buster:amd64cross32: unit:gcc:bullseye:amd64cross32:
<<: *debian_buster_amd64cross32_image <<: *debian_bullseye_amd64cross32_image
<<: *unit_test_job <<: *unit_test_job
needs: needs:
- job: gcc:buster:amd64cross32 - job: gcc:bullseye:amd64cross32
artifacts: true artifacts: true
# Jobs for scan-build builds on Debian 10 "buster" (amd64) # Jobs for scan-build builds on Debian 11 "bullseye" (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)"
@@ -762,7 +765,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 "sid" (amd64) # Job for out-of-tree GCC build on Debian 11 "bullseye" (amd64)
# Also tests configration option: --with-lmdb. # Also tests configration option: --with-lmdb.
gcc:out-of-tree: gcc:out-of-tree:
@@ -796,7 +799,7 @@ unit:gcc:out-of-tree:
<<: *unit_test_job <<: *unit_test_job
<<: *schedules_tags_web_triggering_rules <<: *schedules_tags_web_triggering_rules
# Jobs for tarball GCC builds on Debian 10 "buster" (amd64) # Jobs for tarball GCC builds on Debian 11 "bullseye" (amd64)
gcc:tarball: gcc:tarball:
variables: variables:
@@ -906,7 +909,7 @@ unit:gcc:focal:amd64:
- job: gcc:focal:amd64 - job: gcc:focal:amd64
artifacts: true artifacts: true
# Jobs for ASAN builds on Debian 10 "buster" (amd64) # Jobs for ASAN builds on Fedora 35 (amd64)
gcc:asan: gcc:asan:
variables: variables:
@@ -954,7 +957,7 @@ unit:clang:asan:
- job: clang:asan - job: clang:asan
artifacts: true artifacts: true
# Jobs for TSAN builds on Debian 10 "buster" (amd64) # Jobs for TSAN builds on Fedora 35 (amd64)
gcc:tsan: gcc:tsan:
variables: variables:
@@ -1010,27 +1013,27 @@ unit:clang:tsan:
- job: clang:tsan - job: clang:tsan
artifacts: true artifacts: true
# Jobs for Clang builds on Debian 10 "buster" (amd64) # Jobs for Clang builds on Debian 11 "bullseye" (amd64)
clang:buster:amd64: clang:bullseye:amd64:
variables: variables:
CC: ${CLANG} CC: ${CLANG}
CFLAGS: "${CFLAGS_COMMON} -Wenum-conversion" CFLAGS: "${CFLAGS_COMMON} -Wenum-conversion"
<<: *debian_buster_amd64_image <<: *debian_bullseye_amd64_image
<<: *build_job <<: *build_job
system:clang:buster:amd64: system:clang:bullseye:amd64:
<<: *debian_buster_amd64_image <<: *debian_bullseye_amd64_image
<<: *system_test_job <<: *system_test_job
needs: needs:
- job: clang:buster:amd64 - job: clang:bullseye:amd64
artifacts: true artifacts: true
unit:clang:buster:amd64: unit:clang:bullseye:amd64:
<<: *debian_buster_amd64_image <<: *debian_bullseye_amd64_image
<<: *unit_test_job <<: *unit_test_job
needs: needs:
- job: clang:buster:amd64 - job: clang:bullseye:amd64
artifacts: true artifacts: true
# Jobs for Clang builds on FreeBSD 12 (amd64) # Jobs for Clang builds on FreeBSD 12 (amd64)
@@ -1224,13 +1227,13 @@ respdiff:
MAX_DISAGREEMENTS_PERCENTAGE: "0.5" MAX_DISAGREEMENTS_PERCENTAGE: "0.5"
script: script:
- autoreconf -fi - autoreconf -fi
- ./configure - *configure
- make -j${BUILD_PARALLEL_JOBS:-1} V=1 - make -j${BUILD_PARALLEL_JOBS:-1} V=1
- *setup_interfaces - *setup_interfaces
- git clone --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.isc.org/isc-private/bind-qa.git - git clone --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.isc.org/isc-private/bind-qa.git
- git clone --branch "${BIND_BASELINE_VERSION}" --depth 1 https://gitlab.isc.org/isc-projects/bind9.git refserver - git clone --branch "${BIND_BASELINE_VERSION}" --depth 1 https://gitlab.isc.org/isc-projects/bind9.git refserver
- cd refserver/ - cd refserver/
- ./configure - ./configure --with-randomdev=/dev/urandom
- make -j${BUILD_PARALLEL_JOBS:-1} V=1 - make -j${BUILD_PARALLEL_JOBS:-1} V=1
- cd ../bind-qa/bind9/respdiff - cd ../bind-qa/bind9/respdiff
- bash respdiff.sh -s named -q "${PWD}/100k_mixed.txt" -c 3 -w "${PWD}/rspworkdir" "${CI_PROJECT_DIR}" "${CI_PROJECT_DIR}/refserver" - bash respdiff.sh -s named -q "${PWD}/100k_mixed.txt" -c 3 -w "${PWD}/rspworkdir" "${CI_PROJECT_DIR}" "${CI_PROJECT_DIR}/refserver"
@@ -1255,7 +1258,7 @@ respdiff-third-party:
MAX_DISAGREEMENTS_PERCENTAGE: "0.5" MAX_DISAGREEMENTS_PERCENTAGE: "0.5"
script: script:
- autoreconf -fi - autoreconf -fi
- ./configure - *configure
- make -j${BUILD_PARALLEL_JOBS:-1} V=1 - make -j${BUILD_PARALLEL_JOBS:-1} V=1
- *setup_interfaces - *setup_interfaces
- git clone --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.isc.org/isc-private/bind-qa.git - git clone --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.isc.org/isc-private/bind-qa.git
@@ -1382,7 +1385,7 @@ gcov:
<<: *default_triggering_rules <<: *default_triggering_rules
stage: postcheck stage: postcheck
needs: needs:
- job: system:gcc:buster:amd64 - job: system:gcc:bullseye: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