From: Ondřej Surý <ondrej@isc.org>
Date: Fri, 12 Mar 2021 13:02:57 +0000 (+0100)
Subject: Replace Ubuntu 16.04 LTS with Ubuntu 18.04 LTS in the GitLab CI
X-Git-Tag: v9.17.14~29^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4402a90bb770a77a36a35ce25a69872c8a34c56b;p=thirdparty%2Fbind9.git

Replace Ubuntu 16.04 LTS with Ubuntu 18.04 LTS in the GitLab CI

Ubuntu 16.04 (Xenial Xerus) is reaching End of Standard Support in April
2021 thus we are removing it from the list of supported platforms and
replacing it with Ubuntu 18.04 LTS (Bionic Beaver).
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 13cf945c9b4..81f74328a5d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -147,6 +147,10 @@ stages:
 
 # Ubuntu
 
+.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
@@ -863,6 +867,30 @@ unit:gcc:tumbleweed:amd64:
     - job: gcc:tumbleweed:amd64
       artifacts: true
 
+# Jobs for regular GCC builds on Ubuntu 18.04 Bionic Beaver (amd64)
+
+gcc:bionic:amd64:
+  variables:
+    CC: gcc
+    CFLAGS: "${CFLAGS_COMMON} -O2"
+    EXTRA_CONFIGURE: "--disable-dnstap --disable-geoip"
+  <<: *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:
diff --git a/PLATFORMS.md b/PLATFORMS.md
index 6130167a03d..c4a970aa783 100644
--- a/PLATFORMS.md
+++ b/PLATFORMS.md
@@ -46,7 +46,7 @@ As of Nov 2020, BIND 9.17 is fully supported and regularly tested on the
 following systems:
 
 * Debian 9, 10
-* Ubuntu LTS 16.04, 20.04
+* Ubuntu LTS 18.04, 20.04
 * Fedora 33
 * Red Hat Enterprise Linux / CentOS 7, 8
 * FreeBSD 11.4, 12.2, 13.0
@@ -69,7 +69,7 @@ Server 2016, none of these are tested regularly by ISC.
 * Solaris 11
 * NetBSD
 * Other Linux distributions still supported by their vendors, such as:
-    * Ubuntu 19.04+
+    * Ubuntu 20.10+
     * Gentoo
     * Arch Linux
 * OpenWRT/LEDE 17.01+
@@ -86,7 +86,7 @@ assessed against the risk of adverse effect on officially supported
 platforms.
 
 * Platforms past or close to their respective EOL dates, such as:
-    * Ubuntu 14.04, 18.10
+    * Ubuntu 14.04, 16.04 (Ubuntu ESM releases are not supported)
     * CentOS 6
     * Debian Jessie
     * FreeBSD 10.x