Bring AlmaLinux-9 and AlmaLinux-8 to distros back

config.yaml

@@ -32,9 +32,12 @@ actions:
       - type: "patch"
         name: "0001-Backport-https-github.com-osbuild-images-pull-1926.patch"
         number: "Latest"
+      - type: "patch"
+        name: "0001-Bring-AlmaLinux-9-and-AlmaLinux-8-to-distros-back.patch"
+        number: "Latest"
 
   - modify_release:
-    - suffix: ".alma.2"
+    - suffix: ".alma.3"
       enabled: true
 
   - changelog_entry:

files/0001-Bring-AlmaLinux-9-and-AlmaLinux-8-to-distros-back.patch

@@ -0,0 +1,46 @@
+From db14fa981a84d23b9851d1112d941409124ed868 Mon Sep 17 00:00:00 2001
+From: eabdullin <eabdullin@almalinux.org>
+Date: Fri, 14 Nov 2025 10:25:12 +0300
+Subject: [PATCH] Bring AlmaLinux-9 and AlmaLinux-8 to distros back
+
+---
+ .../osbuild/images/data/distrodefs/distros.yaml  | 16 ++++++++++++++++
+ 1 file changed, 16 insertions(+)
+
+diff --git a/vendor/github.com/osbuild/images/data/distrodefs/distros.yaml b/vendor/github.com/osbuild/images/data/distrodefs/distros.yaml
+index f1d3dab..ff91232 100644
+--- a/vendor/github.com/osbuild/images/data/distrodefs/distros.yaml
++++ b/vendor/github.com/osbuild/images/data/distrodefs/distros.yaml
+@@ -236,6 +236,14 @@ distros:
+       ppc64le: "registry.access.redhat.com/ubi{{.MajorVersion}}/ubi:latest"
+       s390x: "registry.access.redhat.com/ubi{{.MajorVersion}}/ubi:latest"
+ 
++  - <<: *rhel9
++    name: "almalinux-{{.MajorVersion}}.{{.MinorVersion}}"
++    match: 'almalinux-9\.[0-9]{1,2}'
++    product: "AlmaLinux"
++    vendor: "almalinux"
++    ostree_ref_tmpl: "almalinux/9/%%s/edge"
++    iso_label_tmpl: "AlmaLinux-{{.Distro.MajorVersion}}-{{.Distro.MinorVersion}}-{{.Arch}}-dvd"
++
+   - &centos9
+     <<: *rhel9
+     name: centos-9
+@@ -325,6 +333,14 @@ distros:
+       ppc64le: "registry.access.redhat.com/ubi{{.MajorVersion}}/ubi:latest"
+       s390x: "registry.access.redhat.com/ubi{{.MajorVersion}}/ubi:latest"
+ 
++  - <<: *rhel8
++    name: "almalinux-{{.MajorVersion}}.{{.MinorVersion}}"
++    match: 'almalinux-8\.[0-9]{1,2}'
++    product: "AlmaLinux"
++    vendor: "almalinux"
++    ostree_ref_tmpl: "almalinux/8/%%s/edge"
++    iso_label_tmpl: "AlmaLinux-{{.Distro.MajorVersion}}-{{.Distro.MinorVersion}}-{{.Arch}}-dvd"
++
+   - &centos8
+     <<: *rhel8
+     name: centos-8
+-- 
+2.51.0
+