Add Ubuntu 20.04 Focal Fossa, update Fedora to 32

(cherry picked from commit c3e259a8c939f51c3cbdae1942027d79b524a3c4)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1b9a25ab290b5c9e1760bfed2144bfca3950ef1a..3f0b9cd6b949d247d52d1f46df695343f97e13d7 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -121,8 +121,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
@@ -135,6 +135,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
 
@@ -895,6 +899,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:
@@ -1079,25 +1107,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 b/PLATFORMS
index 1cc5134a03df2e8785fbac743e984e77bdd3e107..f580b44bcaf0968f7354b653047907f51e0af1d6 100644 (file)
--- a/PLATFORMS
+++ b/PLATFORMS
@@ -34,12 +34,12 @@ offer support on a "best effort" basis for some.
 
 Regularly tested platforms
 
-As of Mar 2020, BIND 9.16 is fully supported and regularly tested on the
+As of Jul 2020, BIND 9.16 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

diff --git a/PLATFORMS.md b/PLATFORMS.md
index 29e3611896289cf97f3e1dc52d762d5a5d8b049c..bf209ab4c0c481a664c0ec1e7a00f4cf502c0eb7 100644 (file)
--- 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.16 is fully supported and regularly tested on the
+As of Jul 2020, BIND 9.16 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