]> git.ipfire.org Git - thirdparty/bind9.git/commitdiff
Replace Ubuntu 16.04 LTS with Ubuntu 18.04 LTS in the GitLab CI
authorOndřej Surý <ondrej@isc.org>
Fri, 12 Mar 2021 13:02:57 +0000 (14:02 +0100)
committerOndřej Surý <ondrej@isc.org>
Mon, 24 May 2021 19:57:42 +0000 (21:57 +0200)
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

index 4657948aab13bdc53012494b0c4de17f68f9ead0..21d19954dbeef0c820a8a882ac99d3bc29b5d527 100644 (file)
@@ -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)