Replace CentOS 7 & 8 with Oracle Linux

(cherry picked from commit 3085edf1a0e1de7995ddee5fcaf1172fabf32696)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3bc74da0056b5165a6d9eeddd5d5531b9f067a3e..9654b0396bd6fc41e879a5c69d99ca55f44f5508 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -97,14 +97,14 @@ stages:
   image: "$CI_REGISTRY_IMAGE:alpine-3.14-amd64"
   <<: *linux_amd64
 
-# CentOS
+# Oracle Linux
 
-.centos-centos7-amd64: &centos_centos7_amd64_image
-  image: "$CI_REGISTRY_IMAGE:centos-centos7-amd64"
+.oraclelinux-7-amd64: &oraclelinux_7_amd64_image
+  image: "$CI_REGISTRY_IMAGE:oraclelinux-7-amd64"
   <<: *linux_amd64
 
-.centos-centos8-amd64: &centos_centos8_amd64_image
-  image: "$CI_REGISTRY_IMAGE:centos-centos8-amd64"
+.oraclelinux-8-amd64: &oraclelinux_8_amd64_image
+  image: "$CI_REGISTRY_IMAGE:oraclelinux-8-amd64"
   <<: *linux_amd64
 
 # Debian
@@ -590,52 +590,52 @@ unit:gcc:alpine3.14:amd64:
     - job: gcc:alpine3.14:amd64
       artifacts: true
 
-# Jobs for regular GCC builds on CentOS 7 (amd64)
+# Jobs for regular GCC builds on Oracle Linux 7 (amd64)
 
-gcc:centos7:amd64:
+gcc:oraclelinux7:amd64:
   variables:
     CC: gcc
     CFLAGS: "${CFLAGS_COMMON}"
     EXTRA_CONFIGURE: "--with-libidn2"
-  <<: *centos_centos7_amd64_image
+  <<: *oraclelinux_7_amd64_image
   <<: *build_job
 
-system:gcc:centos7:amd64:
-  <<: *centos_centos7_amd64_image
+system:gcc:oraclelinux7:amd64:
+  <<: *oraclelinux_7_amd64_image
   <<: *system_test_job
   needs:
-    - job: gcc:centos7:amd64
+    - job: gcc:oraclelinux7:amd64
       artifacts: true
 
-unit:gcc:centos7:amd64:
-  <<: *centos_centos7_amd64_image
+unit:gcc:oraclelinux7:amd64:
+  <<: *oraclelinux_7_amd64_image
   <<: *unit_test_job
   needs:
-    - job: gcc:centos7:amd64
+    - job: gcc:oraclelinux7:amd64
       artifacts: true
 
-# Jobs for regular GCC builds on CentOS 8 (amd64)
+# Jobs for regular GCC builds on Oracle Linux 8 (amd64)
 
-gcc:centos8:amd64:
+gcc:oraclelinux8:amd64:
   variables:
     CC: gcc
     CFLAGS: "${CFLAGS_COMMON}"
     EXTRA_CONFIGURE: "--enable-buffer-useinline --with-libidn2"
-  <<: *centos_centos8_amd64_image
+  <<: *oraclelinux_8_amd64_image
   <<: *build_job
 
-system:gcc:centos8:amd64:
-  <<: *centos_centos8_amd64_image
+system:gcc:oraclelinux8:amd64:
+  <<: *oraclelinux_8_amd64_image
   <<: *system_test_job
   needs:
-    - job: gcc:centos8:amd64
+    - job: gcc:oraclelinux8:amd64
       artifacts: true
 
-unit:gcc:centos8:amd64:
-  <<: *centos_centos8_amd64_image
+unit:gcc:oraclelinux8:amd64:
+  <<: *oraclelinux_8_amd64_image
   <<: *unit_test_job
   needs:
-    - job: gcc:centos8:amd64
+    - job: gcc:oraclelinux8:amd64
       artifacts: true
 
 # Jobs for regular GCC builds on Debian 9 "stretch" (amd64)

diff --git a/PLATFORMS b/PLATFORMS
index 977e7a5ece91c09ac09f5ed49ce4f45e90429673..6a274ce78514d40ead827a8f3b92f6924d83931c 100644 (file)
--- a/PLATFORMS
+++ b/PLATFORMS
@@ -40,7 +40,7 @@ following systems:
   * Debian 9, 10
   * Ubuntu LTS 18.04, 20.04
   * Fedora 34
-  * Red Hat Enterprise Linux / CentOS 7, 8
+  * Red Hat Enterprise Linux / CentOS / Oracle Linux 7, 8
   * FreeBSD 11.4, 12.2, 13.0
   * OpenBSD 6.9
   * Alpine Linux 3.14

diff --git a/PLATFORMS.md b/PLATFORMS.md
index fa02b57cfef5656ee28cf7e78ac09ef793ccc6a5..d39a55bcd5311f7c8e497c3236aed449362e33d9 100644 (file)
--- a/PLATFORMS.md
+++ b/PLATFORMS.md
@@ -48,7 +48,7 @@ following systems:
 * Debian 9, 10
 * Ubuntu LTS 18.04, 20.04
 * Fedora 34
-* Red Hat Enterprise Linux / CentOS 7, 8
+* Red Hat Enterprise Linux / CentOS / Oracle Linux 7, 8
 * FreeBSD 11.4, 12.2, 13.0
 * OpenBSD 6.9
 * Alpine Linux 3.14

diff --git a/README b/README
index c423f5ddb57c742f441ab2304f936df26edb54bd..2c53ee6e717480e619dd2793803d6ebd5930d03a 100644 (file)
--- a/README
+++ b/README
@@ -136,9 +136,9 @@ time. See Compile-time options below for details on other libraries that
 may be required to support optional features.
 
 Successful builds have been observed on many versions of Linux and UNIX,
-including RHEL/CentOS, Fedora, Debian, Ubuntu, SLES, openSUSE, Slackware,
-Alpine, FreeBSD, NetBSD, OpenBSD, macOS, Solaris, OpenIndiana, OmniOS CE,
-HP-UX, and OpenWRT.
+including RHEL/CentOS/Oracle Linux, Fedora, Debian, Ubuntu, SLES,
+openSUSE, Slackware, Alpine, FreeBSD, NetBSD, OpenBSD, macOS, Solaris,
+OpenIndiana, OmniOS CE, HP-UX, and OpenWRT.
 
 BIND is also available for Windows Server 2012 R2 and higher. See
 win32utils/build.txt for details on building for Windows systems.

diff --git a/README.md b/README.md
index 696697de0eed0abd014037f3ab572792e2a6831f..a075c29401140e5e12240d6c24fd7a68d2fa31d7 100644 (file)
--- a/README.md
+++ b/README.md
@@ -152,9 +152,9 @@ support at compile time. See [Compile-time options](#opts) below
 for details on other libraries that may be required to support
 optional features.
 
-Successful builds have been observed on many versions of Linux and
-UNIX, including RHEL/CentOS, Fedora, Debian, Ubuntu, SLES, openSUSE,
-Slackware, Alpine, FreeBSD, NetBSD, OpenBSD, macOS, Solaris,
+Successful builds have been observed on many versions of Linux and UNIX,
+including RHEL/CentOS/Oracle Linux, Fedora, Debian, Ubuntu, SLES,
+openSUSE, Slackware, Alpine, FreeBSD, NetBSD, OpenBSD, macOS, Solaris,
 OpenIndiana, OmniOS CE, HP-UX, and OpenWRT.
 
 BIND is also available for Windows Server 2012 R2 and higher.  See