Replace CentOS 7 & 8 with Oracle Linux

(cherry picked from commit 3085edf1a0e1de7995ddee5fcaf1172fabf32696)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 26f498e7d01c0c96b8fba61db63b1839d29d7ac3..e59ddef5c1ae3fd26a985192c05c52e5f5c0eb92 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -98,7 +98,7 @@ stages:
   image: "$CI_REGISTRY_IMAGE:alpine-3.14-amd64"
   <<: *linux_amd64
 
-# CentOS
+# Oracle Linux
 
 .centos-centos6-i386: &centos_centos6_i386_image
   image: "$CI_REGISTRY_IMAGE:centos-centos6-i386"
@@ -108,12 +108,12 @@ stages:
   image: "$CI_REGISTRY_IMAGE:centos-centos6-amd64"
   <<: *linux_amd64
 
-.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
@@ -633,52 +633,52 @@ unit:gcc:centos6:amd64:
     - job: gcc:centos6: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/README b/README
index 6b79903af4ea0e1edb101f750293ff72fc81ac46..a854617b53ab7f0bd07c0d64a65f5881591b4f12 100644 (file)
--- a/README
+++ b/README
@@ -407,10 +407,10 @@ Building BIND
 
 Minimally, BIND requires a UNIX or Linux system with an ANSI C compiler,
 basic POSIX support, and a 64-bit integer type. 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.
+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 2008 and higher. See win32utils/
 build.txt for details on building for Windows systems.

diff --git a/README.md b/README.md
index 101abef6930809f5528e3230fc8963c571f355cf..18ffdf048fb628e637bda07357937ad924c25d74 100644 (file)
--- a/README.md
+++ b/README.md
@@ -424,8 +424,8 @@ BIND 9.11.35 is a maintenance release.
 
 Minimally, BIND requires a UNIX or Linux system with an ANSI C compiler,
 basic POSIX support, and a 64-bit integer type. Successful builds have been
-observed on many versions of Linux and UNIX, including RHEL/CentOS, Fedora,
-Debian, Ubuntu, SLES, openSUSE, Slackware, Alpine, FreeBSD, NetBSD,
+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 2008 and higher.  See