From 42c1aea410c652eea1370e1dfe102e3c3775048e Mon Sep 17 00:00:00 2001
From: Michal Nowak <mnowak@isc.org>
Date: Tue, 1 Jul 2025 17:49:17 +0200
Subject: [PATCH 1/2] Add AlmaLinux 10

(cherry picked from commit 42367082cc981c2c42c0416edcf3ba756d63bb68)
---
 .gitlab-ci.yml            | 29 +++++++++++++++++++++++++++++
 doc/arm/platforms.inc.rst |  2 +-
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c7f00a49e8..dfbe2f74ea 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -200,6 +200,10 @@ stages:
   image: "$CI_REGISTRY_IMAGE:almalinux-9-amd64"
   <<: *linux_amd64
 
+.almalinux-10-amd64: &almalinux_10_amd64_image
+  image: "$CI_REGISTRY_IMAGE:almalinux-10-amd64"
+  <<: *linux_amd64
+
 # Debian
 
 .debian-bookworm-amd64: &debian_bookworm_amd64_image
@@ -914,6 +918,31 @@ unit:gcc:almalinux9:amd64:
   <<: *unit_test_job
   needs:
     - job: gcc:almalinux9:amd64
+      artifacts: true
+
+# Jobs for regular GCC builds on Alma Linux 10 (amd64)
+
+gcc:almalinux10:amd64:
+  variables:
+    CC: gcc
+    CFLAGS: "${CFLAGS_COMMON}"
+    EXTRA_CONFIGURE: "--with-libidn2"
+  <<: *almalinux_10_amd64_image
+  <<: *build_job
+
+system:gcc:almalinux10:amd64:
+  <<: *almalinux_10_amd64_image
+  <<: *system_test_job
+  needs:
+    - job: gcc:almalinux10:amd64
+      artifacts: true
+
+unit:gcc:almalinux10:amd64:
+  <<: *almalinux_10_amd64_image
+  <<: *unit_test_job
+  needs:
+    - job: gcc:almalinux10:amd64
+      artifacts: true
 
 # Jobs for scheduled GCC builds on AlmaLinux 8 & 9 FIPS-aware images with FIPS
 # mode in BIND 9 enabled
diff --git a/doc/arm/platforms.inc.rst b/doc/arm/platforms.inc.rst
index bb5d9eb92a..2768f54c08 100644
--- a/doc/arm/platforms.inc.rst
+++ b/doc/arm/platforms.inc.rst
@@ -46,7 +46,7 @@ following systems:
 -  Debian 12
 -  Ubuntu LTS 22.04, 24.04
 -  Fedora 42
--  Red Hat Enterprise Linux / CentOS / AlmaLinux 8, 9
+-  Red Hat Enterprise Linux / CentOS / AlmaLinux 8, 9, 10
 -  FreeBSD 13.4, 14.2
 -  Alpine Linux 3.22
 

From 3ff4a8a478c6fda97539aec7d28bee4549c3c841 Mon Sep 17 00:00:00 2001
From: Michal Nowak <mnowak@isc.org>
Date: Tue, 1 Jul 2025 18:04:02 +0200
Subject: [PATCH 2/2] Do not add AlmaLinux 9 unit and system test in MR
 pipelines

(cherry picked from commit 7c5c16ea6b225d4d356403308eba9bf408d3b854)
---
 .gitlab-ci.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index dfbe2f74ea..eca7ac2082 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -909,6 +909,7 @@ gcc:almalinux9:amd64:
 system:gcc:almalinux9:amd64:
   <<: *almalinux_9_amd64_image
   <<: *system_test_job
+  <<: *api_pipelines_schedules_tags_triggers_web_triggering_rules
   needs:
     - job: gcc:almalinux9:amd64
       artifacts: true
@@ -916,6 +917,7 @@ system:gcc:almalinux9:amd64:
 unit:gcc:almalinux9:amd64:
   <<: *almalinux_9_amd64_image
   <<: *unit_test_job
+  <<: *api_pipelines_schedules_tags_triggers_web_triggering_rules
   needs:
     - job: gcc:almalinux9:amd64
       artifacts: true