From c3e259a8c939f51c3cbdae1942027d79b524a3c4 Mon Sep 17 00:00:00 2001 From: Michal Nowak Date: Tue, 5 May 2020 09:48:11 +0200 Subject: [PATCH 1/6] Add Ubuntu 20.04 Focal Fossa, update Fedora to 32 --- .gitlab-ci.yml | 40 ++++++++++++++++++++++++++++++++++------ PLATFORMS.md | 6 +++--- 2 files changed, 37 insertions(+), 9 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 772ddeb12a..7a340e9381 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -123,8 +123,8 @@ stages: # Fedora -.fedora-31-amd64: &fedora_31_amd64_image - image: "$CI_REGISTRY_IMAGE:fedora-31-amd64" +.fedora-32-amd64: &fedora_32_amd64_image + image: "$CI_REGISTRY_IMAGE:fedora-32-amd64" <<: *linux_amd64 # Ubuntu @@ -137,6 +137,10 @@ stages: image: "$CI_REGISTRY_IMAGE:ubuntu-bionic-amd64" <<: *linux_amd64 +.ubuntu-focal-amd64: &ubuntu_focal_amd64_image + image: "$CI_REGISTRY_IMAGE:ubuntu-focal-amd64" + <<: *linux_amd64 + # Base image # This is a meta image that is used as a base for non-specific jobs @@ -886,6 +890,30 @@ unit:gcc:bionic:amd64: - job: gcc:bionic:amd64 artifacts: true +# Jobs for regular GCC builds on Ubuntu 20.04 Focal Fossa (amd64) + +gcc:focal:amd64: + variables: + CC: gcc + CFLAGS: "${CFLAGS_COMMON} -Og" + EXTRA_CONFIGURE: "--with-libidn2" + <<: *ubuntu_focal_amd64_image + <<: *build_job + +system:gcc:focal:amd64: + <<: *ubuntu_focal_amd64_image + <<: *system_test_job + needs: + - job: gcc:focal:amd64 + artifacts: true + +unit:gcc:focal:amd64: + <<: *ubuntu_focal_amd64_image + <<: *unit_test_job + needs: + - job: gcc:focal:amd64 + artifacts: true + # Jobs for ASAN builds on Debian 10 "buster" (amd64) gcc:asan: @@ -1070,25 +1098,25 @@ unit:gcc:softhsm2.4: - job: gcc:softhsm2.4 artifacts: true -# Jobs for PKCS#11-enabled GCC builds on Fedora 31 (amd64) +# Jobs for PKCS#11-enabled GCC builds on Fedora 32 (amd64) gcc:softhsm2.6: variables: CC: gcc CFLAGS: "${CFLAGS_COMMON} -O1" EXTRA_CONFIGURE: "--with-libidn2 --enable-native-pkcs11 --with-pkcs11=/usr/lib64/pkcs11/libsofthsm2.so" - <<: *fedora_31_amd64_image + <<: *fedora_32_amd64_image <<: *build_job system:gcc:softhsm2.6: - <<: *fedora_31_amd64_image + <<: *fedora_32_amd64_image <<: *system_test_job needs: - job: gcc:softhsm2.6 artifacts: true unit:gcc:softhsm2.6: - <<: *fedora_31_amd64_image + <<: *fedora_32_amd64_image <<: *unit_test_job needs: - job: gcc:softhsm2.6 diff --git a/PLATFORMS.md b/PLATFORMS.md index 66d0474718..e7933102e1 100644 --- a/PLATFORMS.md +++ b/PLATFORMS.md @@ -42,12 +42,12 @@ offer support on a "best effort" basis for some. ### Regularly tested platforms -As of Mar 2020, BIND 9.17 is fully supported and regularly tested on the +As of Jul 2020, BIND 9.17 is fully supported and regularly tested on the following systems: * Debian 9, 10 -* Ubuntu LTS 16.04, 18.04 -* Fedora 31 +* Ubuntu LTS 16.04, 20.04 +* Fedora 32 * Red Hat Enterprise Linux / CentOS 7, 8 * FreeBSD 11.3, 12.1 * OpenBSD 6.6 From 27c8bc1750633a378abbeced5dc9d7346fe8918f Mon Sep 17 00:00:00 2001 From: Michal Nowak Date: Fri, 15 May 2020 11:02:18 +0200 Subject: [PATCH 2/6] Drop Bionic --- .gitlab-ci.yml | 28 ---------------------------- 1 file changed, 28 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7a340e9381..3a04d8b098 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -133,10 +133,6 @@ stages: image: "$CI_REGISTRY_IMAGE:ubuntu-xenial-amd64" <<: *linux_amd64 -.ubuntu-bionic-amd64: &ubuntu_bionic_amd64_image - image: "$CI_REGISTRY_IMAGE:ubuntu-bionic-amd64" - <<: *linux_amd64 - .ubuntu-focal-amd64: &ubuntu_focal_amd64_image image: "$CI_REGISTRY_IMAGE:ubuntu-focal-amd64" <<: *linux_amd64 @@ -866,30 +862,6 @@ unit:gcc:xenial:amd64: - job: gcc:xenial:amd64 artifacts: true -# Jobs for regular GCC builds on Ubuntu 18.04 Bionic Beaver (amd64) - -gcc:bionic:amd64: - variables: - CC: gcc - CFLAGS: "${CFLAGS_COMMON} -Og" - EXTRA_CONFIGURE: "--with-libidn2" - <<: *ubuntu_bionic_amd64_image - <<: *build_job - -system:gcc:bionic:amd64: - <<: *ubuntu_bionic_amd64_image - <<: *system_test_job - needs: - - job: gcc:bionic:amd64 - artifacts: true - -unit:gcc:bionic:amd64: - <<: *ubuntu_bionic_amd64_image - <<: *unit_test_job - needs: - - job: gcc:bionic:amd64 - artifacts: true - # Jobs for regular GCC builds on Ubuntu 20.04 Focal Fossa (amd64) gcc:focal:amd64: From 374660fd37ba99581333cadabed257b65d361636 Mon Sep 17 00:00:00 2001 From: Michal Nowak Date: Mon, 1 Jun 2020 08:15:58 +0200 Subject: [PATCH 3/6] Update to OpenBSD 6.7 --- .gitlab-ci.yml | 8 ++++---- PLATFORMS.md | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3a04d8b098..e4d6115734 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1147,22 +1147,22 @@ unit:clang:freebsd12.1:amd64: - job: clang:freebsd12.1:amd64 artifacts: true -# Jobs for Clang builds on OpenBSD 6.6 (amd64) +# Jobs for Clang builds on OpenBSD 6.7 (amd64) -clang:openbsd6.6:amd64: +clang:openbsd6.7:amd64: variables: CC: clang USER: gitlab-runner <<: *openbsd_amd64 <<: *build_job -system:clang:openbsd6.6:amd64: +system:clang:openbsd6.7:amd64: <<: *openbsd_amd64 <<: *system_test_job variables: USER: gitlab-runner needs: - - job: clang:openbsd6.6:amd64 + - job: clang:openbsd6.7:amd64 artifacts: true only: - schedules diff --git a/PLATFORMS.md b/PLATFORMS.md index e7933102e1..5f12bc0661 100644 --- a/PLATFORMS.md +++ b/PLATFORMS.md @@ -50,7 +50,7 @@ following systems: * Fedora 32 * Red Hat Enterprise Linux / CentOS 7, 8 * FreeBSD 11.3, 12.1 -* OpenBSD 6.6 +* OpenBSD 6.7 * Alpine Linux The amd64, i386, armhf and arm64 CPU architectures are all fully supported. From eff79ab20ca56cd4613f9d2db1d0e722d90c1ebb Mon Sep 17 00:00:00 2001 From: Michal Nowak Date: Mon, 1 Jun 2020 08:18:24 +0200 Subject: [PATCH 4/6] Update to Alpine Linux 3.12 --- .gitlab-ci.yml | 22 +++++++++++----------- PLATFORMS.md | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e4d6115734..a92f309b40 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -75,8 +75,8 @@ stages: # Alpine Linux -.alpine-3.11-amd64: &alpine_3_11_amd64_image - image: "$CI_REGISTRY_IMAGE:alpine-3.11-amd64" +.alpine-3.12-amd64: &alpine_3_12_amd64_image + image: "$CI_REGISTRY_IMAGE:alpine-3.12-amd64" <<: *linux_amd64 # CentOS @@ -507,28 +507,28 @@ push:docs: - main@isc-projects/bind9 - /^v9_[1-9][0-9]$/@isc-projects/bind9 -# Jobs for regular GCC builds on Alpine Linux 3.11 (amd64) +# Jobs for regular GCC builds on Alpine Linux 3.12 (amd64) -gcc:alpine3.11:amd64: +gcc:alpine3.12:amd64: variables: CC: gcc CFLAGS: "${CFLAGS_COMMON}" EXTRA_CONFIGURE: "--enable-dnstap" - <<: *alpine_3_11_amd64_image + <<: *alpine_3_12_amd64_image <<: *build_job -system:gcc:alpine3.11:amd64: - <<: *alpine_3_11_amd64_image +system:gcc:alpine3.12:amd64: + <<: *alpine_3_12_amd64_image <<: *system_test_job needs: - - job: gcc:alpine3.11:amd64 + - job: gcc:alpine3.12:amd64 artifacts: true -unit:gcc:alpine3.11:amd64: - <<: *alpine_3_11_amd64_image +unit:gcc:alpine3.12:amd64: + <<: *alpine_3_12_amd64_image <<: *unit_test_job needs: - - job: gcc:alpine3.11:amd64 + - job: gcc:alpine3.12:amd64 artifacts: true # Jobs for regular GCC builds on CentOS 6 (amd64) diff --git a/PLATFORMS.md b/PLATFORMS.md index 5f12bc0661..ed28fbeab9 100644 --- a/PLATFORMS.md +++ b/PLATFORMS.md @@ -51,7 +51,7 @@ following systems: * Red Hat Enterprise Linux / CentOS 7, 8 * FreeBSD 11.3, 12.1 * OpenBSD 6.7 -* Alpine Linux +* Alpine Linux 3.12 The amd64, i386, armhf and arm64 CPU architectures are all fully supported. From 18f97b9af2b579b9d21ee62472d1547f3576eec1 Mon Sep 17 00:00:00 2001 From: Michal Nowak Date: Wed, 17 Jun 2020 09:28:26 +0200 Subject: [PATCH 5/6] Update FreeBSD 11 to 11.4 --- .gitlab-ci.yml | 17 ++++++++++------- PLATFORMS.md | 2 +- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a92f309b40..a3a52d2643 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1094,30 +1094,32 @@ unit:gcc:softhsm2.6: - job: gcc:softhsm2.6 artifacts: true -# Jobs for Clang builds on FreeBSD 11.3 (amd64) +# Jobs for Clang builds on FreeBSD 11.4 (amd64) -clang:freebsd11.3:amd64: +clang:freebsd11.4:amd64: variables: CFLAGS: "${CFLAGS_COMMON}" USER: gitlab-runner + # Temporarily disable LMDB support [GL #1976] + EXTRA_CONFIGURE: "--without-lmdb" <<: *freebsd_amd64 <<: *build_job -system:clang:freebsd11.3:amd64: +system:clang:freebsd11.4:amd64: <<: *freebsd_amd64 <<: *system_test_job variables: USER: gitlab-runner TEST_PARALLEL_JOBS: 4 needs: - - job: clang:freebsd11.3:amd64 + - job: clang:freebsd11.4:amd64 artifacts: true -unit:clang:freebsd11.3:amd64: +unit:clang:freebsd11.4:amd64: <<: *freebsd_amd64 <<: *unit_test_job needs: - - job: clang:freebsd11.3:amd64 + - job: clang:freebsd11.4:amd64 artifacts: true # Jobs for Clang builds on FreeBSD 12.1 (amd64) @@ -1125,7 +1127,8 @@ unit:clang:freebsd11.3:amd64: clang:freebsd12.1:amd64: variables: CFLAGS: "${CFLAGS_COMMON}" - EXTRA_CONFIGURE: "--enable-dnstap" + # Temporarily disable LMDB support [GL #1976] + EXTRA_CONFIGURE: "--enable-dnstap --without-lmdb" USER: gitlab-runner <<: *freebsd_amd64 <<: *build_job diff --git a/PLATFORMS.md b/PLATFORMS.md index ed28fbeab9..f6fefda1fe 100644 --- a/PLATFORMS.md +++ b/PLATFORMS.md @@ -49,7 +49,7 @@ following systems: * Ubuntu LTS 16.04, 20.04 * Fedora 32 * Red Hat Enterprise Linux / CentOS 7, 8 -* FreeBSD 11.3, 12.1 +* FreeBSD 11.4, 12.1 * OpenBSD 6.7 * Alpine Linux 3.12 From 1be15f59004cec620a05a320444e85ca31f7740b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20K=C4=99pie=C5=84?= Date: Thu, 23 Apr 2020 12:32:35 +0200 Subject: [PATCH 6/6] Fix build-time GSSAPI detection on Tumbleweed The "krb5-devel" package on openSUSE Tumbleweed installs the "krb5-config" binary into a custom prefix, which prevents BIND's "configure" script from autodetecting it. Fix by specifying the path to the "krb5-config" binary using --with-gssapi. --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a3a52d2643..15a7693b40 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -820,7 +820,7 @@ gcc:tumbleweed:amd64: variables: CC: gcc CFLAGS: "${CFLAGS_COMMON}" - EXTRA_CONFIGURE: "--with-libidn2 --with-python" + EXTRA_CONFIGURE: "--with-libidn2 --with-python --with-gssapi=/usr/lib/mit/bin/krb5-config" <<: *tumbleweed_latest_amd64_image <<: *build_job