From: Michal Nowak <mnowak@isc.org>
Date: Thu, 12 Dec 2024 11:25:09 +0000 (+0100)
Subject: Drop Ubuntu 20.04 Focal Fossa
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a0fd8f29e4d2e6809c1634f62e85e20dea77fa17;p=thirdparty%2Fbind9.git

Drop Ubuntu 20.04 Focal Fossa

Focal-specific ./configure option was moved to Bionic.

(cherry picked from commit 326e19a65ae511df56c8a32c49d011052186774f)
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 14aa850a49a..dfc9e1d1a70 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -113,10 +113,6 @@ 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
 
@@ -572,7 +568,7 @@ gcc:bionic:amd64:
   variables:
     CC: gcc
     CFLAGS: "${CFLAGS_COMMON} -O2"
-    EXTRA_CONFIGURE: "--without-geoip2 --with-geoip --with-gssapi"
+    EXTRA_CONFIGURE: "--without-geoip2 --with-geoip --with-gssapi=/usr"
   <<: *ubuntu_bionic_amd64_image
   <<: *build_job
 
@@ -590,23 +586,6 @@ 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 --with-gssapi=/usr"
-  <<: *ubuntu_focal_amd64_image
-  <<: *build_job
-
-system:gcc:focal:amd64:
-  <<: *ubuntu_focal_amd64_image
-  <<: *system_test_job
-  needs:
-    - job: gcc:focal:amd64
-      artifacts: true
-
 # Jobs for builds with ASAN enabled
 
 # "--disable-warn-error" ./configure option disables compiler warnings. This