From: Michal Nowak <mnowak@isc.org>
Date: Mon, 19 Aug 2024 14:32:36 +0000 (+0200)
Subject: Drop Oracle Linux 7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f917cc3abb022f867d1a0d7487743e908d6ee7ed;p=thirdparty%2Fbind9.git

Drop Oracle Linux 7

(cherry picked from commit 4af28f9ffcc9375e0b71293ede17c7be79068cd5)
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 146299a87b0..bc1df1f9c54 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -113,10 +113,6 @@ stages:
 
 # Oracle Linux
 
-.oraclelinux-7-amd64: &oraclelinux_7_amd64_image
-  image: "$CI_REGISTRY_IMAGE:oraclelinux-7-amd64"
-  <<: *linux_amd64
-
 .oraclelinux-8-amd64: &oraclelinux_8_amd64_image
   image: "$CI_REGISTRY_IMAGE:oraclelinux-8-amd64"
   <<: *linux_amd64
@@ -582,31 +578,6 @@ unit:gcc:alpine3.20:amd64:
     - job: gcc:alpine3.20:amd64
       artifacts: true
 
-# Jobs for regular GCC builds on Oracle Linux 7 (amd64)
-
-gcc:oraclelinux7:amd64:
-  variables:
-    CC: gcc
-    # -Wno-address suppresses isc_buffer macro warnings
-    CFLAGS: "${CFLAGS_COMMON} -Wno-address"
-    EXTRA_CONFIGURE: "--with-libidn2"
-  <<: *oraclelinux_7_amd64_image
-  <<: *build_job
-
-system:gcc:oraclelinux7:amd64:
-  <<: *oraclelinux_7_amd64_image
-  <<: *system_test_job
-  needs:
-    - job: gcc:oraclelinux7:amd64
-      artifacts: true
-
-unit:gcc:oraclelinux7:amd64:
-  <<: *oraclelinux_7_amd64_image
-  <<: *unit_test_job
-  needs:
-    - job: gcc:oraclelinux7:amd64
-      artifacts: true
-
 # Jobs for regular GCC builds on Oracle Linux 8 (amd64)
 
 gcc:oraclelinux8:amd64:
diff --git a/doc/arm/platforms.rst b/doc/arm/platforms.rst
index aca45cbbcef..8cff8ff151f 100644
--- a/doc/arm/platforms.rst
+++ b/doc/arm/platforms.rst
@@ -48,7 +48,7 @@ following systems:
 -  Debian 11, 12
 -  Ubuntu LTS 20.04, 22.04, 24.04
 -  Fedora 40
--  Red Hat Enterprise Linux / CentOS / Oracle Linux 7, 8, 9
+-  Red Hat Enterprise Linux / CentOS / Oracle Linux 8, 9
 -  FreeBSD 13.3, 14.0
 -  Alpine Linux 3.20
 
@@ -93,7 +93,7 @@ supported platforms.
 -  Platforms past or close to their respective EOL dates, such as:
 
    -  Ubuntu 14.04, 16.04 (Ubuntu ESM releases are not supported)
-   -  CentOS 6
+   -  Red Hat Enterprise Linux / CentOS / Oracle Linux 6, 7
    -  Debian 8 Jessie, 9 Stretch, 10 Buster
    -  FreeBSD 10.x, 11.x