[couchdb-ci] branch main updated: Add s390x support for rhel8 clone and replace rockylinux:9 with almalinux:9

[va...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

vatamane pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/couchdb-ci.git


The following commit(s) were added to refs/heads/main by this push:
     new 5435692  Add s390x support for rhel8 clone and replace rockylinux:9 with almalinux:9
5435692 is described below

commit 54356922cfde6f2e07cc1c04647f0017d99b9afd
Author: Kun-Lu <ku...@ibm.com>
AuthorDate: Fri May 19 12:38:08 2023 -0400

    Add s390x support for rhel8 clone and replace rockylinux:9 with almalinux:9
    
    Signed-off-by: Kun-Lu <ku...@ibm.com>
---
 bin/detect-os.sh                          | 2 +-
 bin/install-dependencies.sh               | 2 +-
 bin/source-erlang.sh                      | 2 +-
 bin/yum-dependencies.sh                   | 2 +-
 build.sh                                  | 4 ++--
 dockerfiles/{rockylinux-8 => almalinux-8} | 2 +-
 dockerfiles/{rockylinux-9 => almalinux-9} | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/bin/detect-os.sh b/bin/detect-os.sh
index a1c6a10..f296023 100755
--- a/bin/detect-os.sh
+++ b/bin/detect-os.sh
@@ -68,7 +68,7 @@ case "${OSTYPE}" in
     # and finally some rough heuristics
     if [[ -f /etc/redhat-release ]]; then
       # /etc/redhat-release is so inconsistent, we use rpm instead
-      rhelish=$(rpm -qa '(redhat|sl|slf|centos|centos-linux|oraclelinux|rocky)-release(|-server|-workstation|-client|-computenode)' 2>/dev/null | head -1)
+      rhelish=$(rpm -qa '(redhat|sl|slf|centos|centos-linux|oraclelinux|almalinux)-release(|-server|-workstation|-client|-computenode)' 2>/dev/null | head -1)
       if [[ $rhelish ]]; then
         ID=${ID:-$(echo ${rhelish} | awk -F'-' '{print tolower($1)}')}
         VERSION_ID=${VERSION_ID:-$(echo ${rhelish} | sed -E 's/([^[:digit:]]+)([[:digit:]]+)(.*)/\2/' )}
diff --git a/bin/install-dependencies.sh b/bin/install-dependencies.sh
index 9627f80..2218f3f 100755
--- a/bin/install-dependencies.sh
+++ b/bin/install-dependencies.sh
@@ -83,7 +83,7 @@ arms='(aarch64)'
 
 case "${OSTYPE}" in
   linux*)
-    redhats='(rhel|centos|fedora|rocky)'
+    redhats='(rhel|centos|fedora|almalinux)'
     debians='(debian|ubuntu)'
     latest='(stretch|buster|bionic)'
 
diff --git a/bin/source-erlang.sh b/bin/source-erlang.sh
index f613955..259ad1a 100755
--- a/bin/source-erlang.sh
+++ b/bin/source-erlang.sh
@@ -38,7 +38,7 @@ SCRIPTPATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 . ${SCRIPTPATH}/detect-os.sh
 
-redhats='(rhel|centos|fedora|rocky)'
+redhats='(rhel|centos|fedora|almalinux)'
 debians='(debian|ubuntu)'
 
 echo "Erlang source build started @ $(date)"
diff --git a/bin/yum-dependencies.sh b/bin/yum-dependencies.sh
index 1036bd3..c6e0913 100755
--- a/bin/yum-dependencies.sh
+++ b/bin/yum-dependencies.sh
@@ -86,7 +86,7 @@ echo "Detected RedHat/Centos/Fedora version: ${VERSION_ID}   arch: ${ARCH}"
 
 # Enable EPEL
 yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-${VERSION_ID}.noarch.rpm || true
-# PowerTools for Rocky 8
+# PowerTools for Alma 8
 if [[ ${VERSION_ID} -eq 8 ]]; then
   dnf install -y 'dnf-command(config-manager)'
   dnf config-manager --set-enabled powertools
diff --git a/build.sh b/build.sh
index 1664602..5c3245e 100755
--- a/build.sh
+++ b/build.sh
@@ -48,7 +48,7 @@ SCRIPTPATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 #
 DEBIANS="debian-buster debian-bullseye"
 UBUNTUS="ubuntu-bionic ubuntu-focal ubuntu-jammy"
-CENTOSES="centos-7 rockylinux-8 rockylinux-9"
+CENTOSES="centos-7 almalinux-8 almalinux-9"
 XPLAT_BASE="debian-bullseye"
 XPLAT_ARCHES="arm64v8 ppc64le s390x"
 PASSED_BUILDARGS="$buildargs"
@@ -104,7 +104,7 @@ buildx-platform() {
   find-erlang-version $1
   pull-os-image $1
   split-os-ver $1
-  if [ "$os" == "rockylinux" ]; then
+  if [ "$os" == "almalinux" ]; then
     repo="centos"
   else
     repo="$os"
diff --git a/dockerfiles/rockylinux-8 b/dockerfiles/almalinux-8
similarity index 99%
rename from dockerfiles/rockylinux-8
rename to dockerfiles/almalinux-8
index 7271aa9..b205fdc 100644
--- a/dockerfiles/rockylinux-8
+++ b/dockerfiles/almalinux-8
@@ -17,7 +17,7 @@
 # NOTE: These are intended to be built using the arguments as
 # described in ../build.sh. See that script for more details.
 
-FROM rockylinux:8
+FROM almalinux:8
 
 # Install Java
 ENV JAVA_HOME=/opt/java/openjdk
diff --git a/dockerfiles/rockylinux-9 b/dockerfiles/almalinux-9
similarity index 99%
rename from dockerfiles/rockylinux-9
rename to dockerfiles/almalinux-9
index a3c9517..0757401 100644
--- a/dockerfiles/rockylinux-9
+++ b/dockerfiles/almalinux-9
@@ -17,7 +17,7 @@
 # NOTE: These are intended to be built using the arguments as
 # described in ../build.sh. See that script for more details.
 
-FROM rockylinux:9
+FROM almalinux:9
 
 # Install Java
 ENV JAVA_HOME=/opt/java/openjdk