From f44da7ce7cb5e1a189bf5fe28cccb084bb9acff1 Mon Sep 17 00:00:00 2001
From: CrazyMax <crazy-max@users.noreply.github.com>
Date: Sat, 5 Aug 2023 11:17:29 +0200
Subject: [PATCH] rpm: add almalinux 8 and 9

Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
---
 Makefile                                 |  2 +-
 common/packages.hcl                      | 22 ++++++++++++++++++++++
 common/packages.mk                       | 20 +++++++++++++++++++-
 common/scripts/rpm-init.sh               |  6 +++---
 common/scripts/verify-rpm-init.sh        |  6 +++---
 pkg/credential-helpers/verify.Dockerfile |  4 ++--
 6 files changed, 50 insertions(+), 10 deletions(-)

diff --git a/Makefile b/Makefile
index 6b1cb947..510a414a 100644
--- a/Makefile
+++ b/Makefile
@@ -40,7 +40,7 @@ include common/packages.mk
 
 GHA_MATRIX ?= minimal
 ifeq ($(GHA_MATRIX),minimal)
-	GHA_RELEASES := debian10 debian11 debian12 ubuntu2004 ubuntu2204 ubuntu2310 centos7 centos9 oraclelinux7 fedora39 rockylinux9 static
+	GHA_RELEASES := debian10 debian11 debian12 ubuntu2004 ubuntu2204 ubuntu2310 centos7 centos9 oraclelinux7 fedora39 rockylinux9 almalinux9 static
 else ifeq ($(GHA_MATRIX),all)
 	GHA_RELEASES := $(PKG_DEB_RELEASES) $(PKG_RPM_RELEASES) static
 else
diff --git a/common/packages.hcl b/common/packages.hcl
index 52e4073f..00867ad2 100644
--- a/common/packages.hcl
+++ b/common/packages.hcl
@@ -295,6 +295,28 @@ target "_pkg-rockylinux9" {
   }
 }
 
+target "_pkg-almalinux8" {
+  args = {
+    PKG_RELEASE = "almalinux8"
+    PKG_TYPE = "rpm"
+    PKG_DISTRO = "almalinux"
+    PKG_DISTRO_ID = "8"
+    PKG_DISTRO_SUITE = "8"
+    PKG_BASE_IMAGE = "almalinux:8"
+  }
+}
+
+target "_pkg-almalinux9" {
+  args = {
+    PKG_RELEASE = "almalinux9"
+    PKG_TYPE = "rpm"
+    PKG_DISTRO = "almalinux"
+    PKG_DISTRO_ID = "9"
+    PKG_DISTRO_SUITE = "9"
+    PKG_BASE_IMAGE = "almalinux:9"
+  }
+}
+
 target "_pkg-static" {
   args = {
     PKG_RELEASE = ""
diff --git a/common/packages.mk b/common/packages.mk
index 4a478d7b..187f08b7 100644
--- a/common/packages.mk
+++ b/common/packages.mk
@@ -16,7 +16,7 @@
 # if you add a new release
 PKG_APK_RELEASES ?= alpine314 alpine315 alpine316
 PKG_DEB_RELEASES ?= debian10 debian11 debian12 ubuntu2004 ubuntu2204 ubuntu2304 ubuntu2310 raspbian10 raspbian11 raspbian12
-PKG_RPM_RELEASES ?= centos7 centos8 centos9 fedora37 fedora38 fedora39 oraclelinux7 oraclelinux8 oraclelinux9 rockylinux8 rockylinux9
+PKG_RPM_RELEASES ?= centos7 centos8 centos9 fedora37 fedora38 fedora39 oraclelinux7 oraclelinux8 oraclelinux9 rockylinux8 rockylinux9 almalinux8 almalinux9
 
 # PKG_SUPPORTED_PLATFORMS could be replaced by:
 # docker buildx imagetools inspect centos:7 --format "{{json .Manifest}}" | jq -r '.manifests[] | "\(.platform.os)/\(.platform.architecture)/\(.platform.variant)"' | sed 's#/null$##' | tr '\n' ',' | sed 's#,$##'
@@ -259,6 +259,24 @@ pkg-info-rockylinux9:
 	$(eval PKG_BASE_IMAGE = rockylinux/rockylinux:9)
 	$(eval PKG_SUPPORTED_PLATFORMS = linux/amd64 linux/arm64)
 
+.PHONY: pkg-info-almalinux8
+pkg-info-almalinux8:
+	$(eval PKG_TYPE = rpm)
+	$(eval PKG_DISTRO = almalinux)
+	$(eval PKG_DISTRO_ID = 8)
+	$(eval PKG_DISTRO_SUITE = 8)
+	$(eval PKG_BASE_IMAGE = almalinux:8)
+	$(eval PKG_SUPPORTED_PLATFORMS = linux/amd64 linux/arm64 linux/ppc64le linux/s390x)
+
+.PHONY: pkg-info-almalinux9
+pkg-info-almalinux9:
+	$(eval PKG_TYPE = rpm)
+	$(eval PKG_DISTRO = almalinux)
+	$(eval PKG_DISTRO_ID = 9)
+	$(eval PKG_DISTRO_SUITE = 9)
+	$(eval PKG_BASE_IMAGE = almalinux:9)
+	$(eval PKG_SUPPORTED_PLATFORMS = linux/amd64 linux/arm64 linux/ppc64le linux/s390x)
+
 .PHONY: pkg-info-static
 pkg-info-static:
 	$(eval PKG_TYPE = static)
diff --git a/common/scripts/rpm-init.sh b/common/scripts/rpm-init.sh
index 77ce5467..46c6afc8 100755
--- a/common/scripts/rpm-init.sh
+++ b/common/scripts/rpm-init.sh
@@ -83,11 +83,11 @@ case "$pkgrelease" in
   fedora*)
     dnf install -y git rpm-build rpmlint dnf-plugins-core
     ;;
-  rockylinux8)
+  rockylinux8|almalinux8)
     dnf install -y git rpm-build rpmlint dnf-plugins-core epel-release
-    dnf config-manager --set-enabled devel
+    dnf config-manager --set-enabled powertools
     ;;
-  rockylinux*)
+  rockylinux*|almalinux*)
     dnf install -y git rpm-build rpmlint dnf-plugins-core epel-release
     dnf config-manager --set-enabled crb
     ;;
diff --git a/common/scripts/verify-rpm-init.sh b/common/scripts/verify-rpm-init.sh
index e41cc357..d4ffd146 100755
--- a/common/scripts/verify-rpm-init.sh
+++ b/common/scripts/verify-rpm-init.sh
@@ -52,11 +52,11 @@ case "$pkgrelease" in
   fedora*)
     dnf install -y findutils dnf-plugins-core
     ;;
-  rockylinux8)
+  rockylinux8|almalinux8)
     dnf install -y findutils dnf-plugins-core epel-release
-    dnf config-manager --set-enabled devel
+    dnf config-manager --set-enabled powertools
     ;;
-  rockylinux*)
+  rockylinux*|almalinux*)
     dnf install -y findutils dnf-plugins-core epel-release
     dnf config-manager --set-enabled crb
     ;;
diff --git a/pkg/credential-helpers/verify.Dockerfile b/pkg/credential-helpers/verify.Dockerfile
index 4b3b2036..ce70912e 100644
--- a/pkg/credential-helpers/verify.Dockerfile
+++ b/pkg/credential-helpers/verify.Dockerfile
@@ -70,7 +70,7 @@ RUN --mount=from=bin-folder,target=/build <<EOT
   extraflags=""
   case "$PKG_RELEASE" in
     # required pass package not available
-    centos7|oraclelinux9|rockylinux8)
+    centos7|oraclelinux9|rockylinux8|almalinux8)
       extraflags="--skip-broken"
       ;;
     centos9)
@@ -89,7 +89,7 @@ RUN --mount=from=bin-folder,target=/build <<EOT
   docker-credential-secretservice version
   case "$PKG_RELEASE" in
     # FIXME: skip pass credential helper smoke test for some distros
-    centos7|centos9|oraclelinux9|rockylinux8) ;;
+    centos7|centos9|oraclelinux9|rockylinux8|almalinux8) ;;
     *) docker-credential-pass version ;;
   esac
 EOT