From 3085edf1a0e1de7995ddee5fcaf1172fabf32696 Mon Sep 17 00:00:00 2001
From: Michal Nowak <mnowak@isc.org>
Date: Tue, 15 Jun 2021 09:49:21 +0200
Subject: [PATCH] Replace CentOS 7 & 8 with Oracle Linux

---
 .gitlab-ci.yml | 46 +++++++++++++++++++++++-----------------------
 PLATFORMS.md   |  2 +-
 README.md      |  8 ++++----
 3 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index df82009d5b..5b2e771bb5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -100,14 +100,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
@@ -564,52 +564,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.md b/PLATFORMS.md
index 477f23b86a..f0ad8e85a3 100644
--- a/PLATFORMS.md
+++ b/PLATFORMS.md
@@ -63,7 +63,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.md b/README.md
index 1c09d7b076..06fdd90099 100644
--- a/README.md
+++ b/README.md
@@ -133,10 +133,10 @@ capability 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,
-OpenIndiana, OmniOS CE, HP-UX, and OpenWRT.
+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.
 
 To build on a Unix or Linux system, use: