From b0949d960b66315fec8ad22b138158229dcc325f Mon Sep 17 00:00:00 2001
From: Michal Nowak <mnowak@isc.org>
Date: Wed, 9 Jul 2025 17:39:51 +0200
Subject: [PATCH] Add AlmaLinux 10 FIPS

(cherry picked from commit 1f459470883bf7ea9958a29caa98294499293cb3)
---
 .gitlab-ci.yml | 45 ++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 44 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cb33a75f3e..829e324f78 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -127,6 +127,15 @@ stages:
     - fips
     - shell
 
+.almalinux-10fips-amd64-image: &almalinux_10fips_amd64_image
+  tags:
+    - almalinux-10
+    - amd64
+    - autoscaler
+    - aws
+    - fips
+    - shell
+
 # Autoscaling GitLab Runner on AWS EC2 (amd64)
 
 .linux-amd64: &linux_amd64
@@ -338,7 +347,14 @@ stages:
   - cd bind-*
 
 .fips-feature-test: &fips_feature_test
-    - if bin/tests/system/feature-test --have-fips-mode; then fips-mode-setup --check; fips-mode-setup --is-enabled; fi
+    - if bin/tests/system/feature-test --have-fips-mode; then
+        if [ "$(cat /proc/sys/crypto/fips_enabled)" = "1" ]; then
+          echo "FIPS is enabled";
+        else
+          echo "FIPS is disabled";
+          exit 1;
+        fi
+      fi
 
 .check_for_junit_xml: &check_for_junit_xml
     # test if junit.xml file exists and is longer 40 bytes
@@ -1022,6 +1038,33 @@ unit:gcc:9fips:amd64:
     - job: gcc:9fips:amd64
       artifacts: true
 
+gcc:10fips:amd64:
+  variables:
+    CC: gcc
+    CFLAGS: "${CFLAGS_COMMON}"
+    EXTRA_CONFIGURE: "--with-libidn2 --enable-fips-mode --disable-leak-detection --disable-tracing"
+    GIT_CLONE_PATH: "${GIT_CLONE_PATH_INSTANCE_EXECUTOR}"
+  <<: *almalinux_10fips_amd64_image
+  <<: *build_job
+
+system:gcc:10fips:amd64:
+  <<: *almalinux_10fips_amd64_image
+  <<: *system_test_job
+  variables:
+    GIT_CLONE_PATH: "${GIT_CLONE_PATH_INSTANCE_EXECUTOR}"
+  needs:
+    - job: gcc:10fips:amd64
+      artifacts: true
+
+unit:gcc:10fips:amd64:
+  <<: *almalinux_10fips_amd64_image
+  <<: *unit_test_job
+  variables:
+    GIT_CLONE_PATH: "${GIT_CLONE_PATH_INSTANCE_EXECUTOR}"
+  needs:
+    - job: gcc:10fips:amd64
+      artifacts: true
+
 gcc:tarball:nosphinx:
   variables:
     CC: gcc