From 46b969f23b5ee7d971eef752d1925a0c017cb751 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= <ondrej@isc.org>
Date: Fri, 12 Mar 2021 14:02:57 +0100
Subject: [PATCH] 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).

(cherry picked from commit 4402a90bb770a77a36a35ce25a69872c8a34c56b)
---
 .gitlab-ci.yml | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4657948aab..21d19954db 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -148,8 +148,8 @@ stages:
 
 # Ubuntu
 
-.ubuntu-xenial-amd64: &ubuntu_xenial_amd64_image
-  image: "$CI_REGISTRY_IMAGE:ubuntu-xenial-amd64"
+.ubuntu-bionic-amd64: &ubuntu_bionic_amd64_image
+  image: "$CI_REGISTRY_IMAGE:ubuntu-bionic-amd64"
   <<: *linux_amd64
 
 .ubuntu-focal-amd64: &ubuntu_focal_amd64_image
@@ -891,28 +891,28 @@ unit:gcc:fedora33:amd64:
     - job: gcc:fedora33:amd64
       artifacts: true
 
-# Jobs for regular GCC builds on Ubuntu 16.04 Xenial Xerus (amd64)
+# Jobs for regular GCC builds on Ubuntu 18.04 Bionic Beaver (amd64)
 
-gcc:xenial:amd64:
+gcc:bionic:amd64:
   variables:
     CC: gcc
     CFLAGS: "${CFLAGS_COMMON} -O2"
     EXTRA_CONFIGURE: "--without-geoip2 --with-geoip --disable-dnstap"
-  <<: *ubuntu_xenial_amd64_image
+  <<: *ubuntu_bionic_amd64_image
   <<: *build_job
 
-system:gcc:xenial:amd64:
-  <<: *ubuntu_xenial_amd64_image
+system:gcc:bionic:amd64:
+  <<: *ubuntu_bionic_amd64_image
   <<: *system_test_job
   needs:
-    - job: gcc:xenial:amd64
+    - job: gcc:bionic:amd64
       artifacts: true
 
-unit:gcc:xenial:amd64:
-  <<: *ubuntu_xenial_amd64_image
+unit:gcc:bionic:amd64:
+  <<: *ubuntu_bionic_amd64_image
   <<: *unit_test_job
   needs:
-    - job: gcc:xenial:amd64
+    - job: gcc:bionic:amd64
       artifacts: true
 
 # Jobs for regular GCC builds on Ubuntu 20.04 Focal Fossa (amd64)