Support EL10

.github/workflows/ci.yaml

@@ -47,6 +47,7 @@ jobs:
         set:
           - "el8"
           - "el9"
+          - "el10"
           - "debian-11"
           - "debian-12"
           - "ubuntu-2004"

.sync.yml

@@ -7,6 +7,7 @@ Rakefile:
     set:
       - el8
       - el9
+      - el10
       - debian-11
       - debian-12
       - ubuntu-2004
@@ -41,8 +42,6 @@ appveyor.yml:
   delete: true
 spec/acceptance/nodesets/el7.yml:
   delete: true
-spec/acceptance/nodesets/el10.yml:
-  delete: true
 spec/acceptance/nodesets/debian-11.yml:
   packages:
     - iproute2

README.md

@@ -642,6 +642,7 @@ This module has been tested on:
 
 * RedHat/Rocky/AlmaLinux 8 x86_64
 * RedHat/Rocky/AlmaLinux 9 x86_64
+* RedHat/Rocky/AlmaLinux 10 x86_64
 * Debian 11 x86_64
 * Debian 12 x86_64
 * Ubuntu 20.04 x86_64

metadata.json

@@ -42,21 +42,24 @@
       "operatingsystem": "RedHat",
       "operatingsystemrelease": [
         "8",
-        "9"
+        "9",
+        "10"
       ]
     },
     {
       "operatingsystem": "Rocky",
       "operatingsystemrelease": [
         "8",
-        "9"
+        "9",
+        "10"
       ]
     },
     {
       "operatingsystem": "AlmaLinux",
       "operatingsystemrelease": [
         "8",
-        "9"
+        "9",
+        "10"
       ]
     },
     {

spec/acceptance/nodesets/el10.yml

@@ -0,0 +1,26 @@
+HOSTS:
+  el10:
+    roles:
+      - agent
+    platform: el-9-x86_64
+    hypervisor: docker
+    image: almalinux:10
+    docker_preserve_image: true
+    docker_cmd:
+      - '/usr/sbin/init'
+    docker_image_commands:
+      - 'dnf install -y dnf-utils'
+      - 'dnf config-manager --set-enabled crb'
+      - 'dnf install -y wget which cronie iproute initscripts langpacks-en glibc-all-langpacks glibc-langpack-en cpio gnupg2'
+    docker_env:
+      - LANG=en_US.UTF-8
+      - LANGUAGE=en_US.UTF-8
+      - LC_ALL=en_US.UTF-8
+    docker_container_name: 'keycloak-el10'
+CONFIG:
+  log_level: debug
+  type: foss
+ssh:
+  password: root
+  auth_methods: ["password"]
+

spec/spec_helper_acceptance_setup.rb

@@ -25,7 +25,11 @@
              else
                '/etc/puppetlabs/puppet'
              end
-
+default_db = if fact('os.family') == 'RedHat' && fact('os.release.major').to_i >= 10
+               'postgres'
+             else
+               'mariadb'
+             end
 hiera_yaml = <<-HIERA_YAML
 ---
 version: 5
@@ -34,7 +38,7 @@
   data_hash: yaml_data
 hierarchy:
   - name: 'os family major release'
-    path: "os/%{facts.os.name}/%{facts.os.release.major}.yaml"
+    path: "os/%{facts.os.family}/%{facts.os.release.major}.yaml"
   - name: "Common"
     path: "common.yaml"
 HIERA_YAML
@@ -43,15 +47,24 @@
 keycloak::version: '#{RSpec.configuration.keycloak_version}'
 keycloak::http_host: '0.0.0.0'
 keycloak::hostname: localhost
-keycloak::db: mariadb
+keycloak::db: #{default_db}
 keycloak::proxy: edge
 keycloak::features:
   - scripts
 # Force only listen on IPv4 for testing
 keycloak::java_opts: '-Djava.net.preferIPv4Stack=true'
-postgresql::server::service_status: 'service postgresql status 2>/dev/null 1>/dev/null'
 COMMON_YAML
 
+# Remove logic once merged and released:
+# https://github.com/puppetlabs/puppetlabs-postgresql/pull/1650
+el10_yaml = <<-EL10_YAML
+---
+postgresql::globals::version: '16'
+postgresql::globals::manage_package_repo: true
+EL10_YAML
+
 create_remote_file(hosts, File.join(puppet_dir, 'hiera.yaml'), hiera_yaml)
 on hosts, "mkdir -p #{File.join(puppet_dir, 'data')}"
 create_remote_file(hosts, File.join(puppet_dir, 'data/common.yaml'), common_yaml)
+on hosts, "mkdir -p #{File.join(puppet_dir, 'data/os/RedHat')}"
+create_remote_file(hosts, File.join(puppet_dir, 'data/os/RedHat/10.yaml'), el10_yaml)