From 1458d8422d153633f6be193736c7fab2ba3e6743 Mon Sep 17 00:00:00 2001
From: treydock <tdockendorf@osc.edu>
Date: Mon, 10 Oct 2022 09:25:37 -0400
Subject: [PATCH] Support EL9 (#250)

---
 .github/workflows/ci.yaml                     |  9 ++++---
 .sync.yml                                     |  9 ++++---
 README.md                                     |  3 ++-
 metadata.json                                 | 15 ++++++++---
 .../nodesets/{centos-7.yml => el7.yml}        |  0
 .../nodesets/{rocky-8.yml => el8.yml}         |  2 +-
 spec/acceptance/nodesets/el9.yml              | 26 +++++++++++++++++++
 spec/acceptance/nodesets/ubuntu-1804.yml      |  2 +-
 8 files changed, 52 insertions(+), 14 deletions(-)
 rename spec/acceptance/nodesets/{centos-7.yml => el7.yml} (100%)
 rename spec/acceptance/nodesets/{rocky-8.yml => el8.yml} (94%)
 create mode 100644 spec/acceptance/nodesets/el9.yml

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 0bb72b10..f449c2fb 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -56,8 +56,9 @@ jobs:
       fail-fast: false
       matrix:
         set:
-          - "centos-7"
-          - "rocky-8"
+          - "el7"
+          - "el8"
+          - "el9"
           - "debian-10"
           - "debian-11"
           - "ubuntu-1804"
@@ -70,11 +71,11 @@ jobs:
         keycloak_full:
           - "no"
         include:
-          - set: "centos-7"
+          - set: "el7"
             puppet: "puppet6"
             keycloak_version: "18.0.0"
             keycloak_full: "yes"
-          - set: "centos-7"
+          - set: "el7"
             puppet: "puppet7"
             keycloak_version: "18.0.0"
             keycloak_full: "yes"
diff --git a/.sync.yml b/.sync.yml
index a310f279..95084526 100644
--- a/.sync.yml
+++ b/.sync.yml
@@ -15,8 +15,9 @@ Rakefile:
   acceptance_name: '${{ matrix.puppet }} ${{ matrix.set }} (keycloak=${{ matrix.keycloak_version }} full=${{ matrix.keycloak_full }})'
   acceptance_matrix:
     set:
-      - centos-7
-      - rocky-8
+      - el7
+      - el8
+      - el9
       - debian-10
       - debian-11
       - ubuntu-1804
@@ -28,11 +29,11 @@ Rakefile:
       - '18.0.0'
     keycloak_full: ['no']
   acceptance_includes:
-    - set: centos-7
+    - set: el7
       puppet: puppet6
       keycloak_version: 18.0.0
       keycloak_full: 'yes'
-    - set: centos-7
+    - set: el7
       puppet: puppet7
       keycloak_version: 18.0.0
       keycloak_full: 'yes'
diff --git a/README.md b/README.md
index b80cc011..86125b50 100644
--- a/README.md
+++ b/README.md
@@ -596,7 +596,8 @@ keycloak_required_action { 'webauthn-register on master':
 This module has been tested on:
 
 * RedHat/CentOS 7 x86_64
-* RedHat/Rocky 8 x86_64
+* RedHat/Rocky/AlmaLinux 8 x86_64
+* RedHat/Rocky/AlmaLinux 9 x86_64
 * Debian 10 x86_64
 * Debian 11 x86_64
 * Ubuntu 18.04 x86_64
diff --git a/metadata.json b/metadata.json
index 8e282b5e..536d0832 100644
--- a/metadata.json
+++ b/metadata.json
@@ -42,7 +42,8 @@
       "operatingsystem": "RedHat",
       "operatingsystemrelease": [
         "7",
-        "8"
+        "8",
+        "9"
       ]
     },
     {
@@ -54,7 +55,15 @@
     {
       "operatingsystem": "Rocky",
       "operatingsystemrelease": [
-        "8"
+        "8",
+        "9"
+      ]
+    },
+    {
+      "operatingsystem": "AlmaLinux",
+      "operatingsystemrelease": [
+        "8",
+        "9"
       ]
     },
     {
@@ -80,5 +89,5 @@
   ],
   "pdk-version": "2.1.0",
   "template-url": "https://github.com/treydock/pdk-templates.git#master",
-  "template-ref": "heads/master-0-gc7a5ca2"
+  "template-ref": "heads/master-0-gd5daad3"
 }
diff --git a/spec/acceptance/nodesets/centos-7.yml b/spec/acceptance/nodesets/el7.yml
similarity index 100%
rename from spec/acceptance/nodesets/centos-7.yml
rename to spec/acceptance/nodesets/el7.yml
diff --git a/spec/acceptance/nodesets/rocky-8.yml b/spec/acceptance/nodesets/el8.yml
similarity index 94%
rename from spec/acceptance/nodesets/rocky-8.yml
rename to spec/acceptance/nodesets/el8.yml
index 505e473b..8ced0b7d 100644
--- a/spec/acceptance/nodesets/rocky-8.yml
+++ b/spec/acceptance/nodesets/el8.yml
@@ -4,7 +4,7 @@ HOSTS:
       - agent
     platform: el-8-x86_64
     hypervisor: docker
-    image: rockylinux/rockylinux:8
+    image: almalinux:8
     docker_preserve_image: true
     docker_cmd:
       - '/usr/sbin/init'
diff --git a/spec/acceptance/nodesets/el9.yml b/spec/acceptance/nodesets/el9.yml
new file mode 100644
index 00000000..fbcb8bab
--- /dev/null
+++ b/spec/acceptance/nodesets/el9.yml
@@ -0,0 +1,26 @@
+HOSTS:
+  almalinux-9:
+    roles:
+      - agent
+    platform: el-9-x86_64
+    hypervisor: docker
+    image: almalinux:9
+    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 cpio'
+    docker_env:
+      - LANG=en_US.UTF-8
+      - LANGUAGE=en_US.UTF-8
+      - LC_ALL=en_US.UTF-8
+    docker_container_name: 'keycloak-el9'
+CONFIG:
+  log_level: debug
+  type: foss
+ssh:
+  password: root
+  auth_methods: ["password"]
+
diff --git a/spec/acceptance/nodesets/ubuntu-1804.yml b/spec/acceptance/nodesets/ubuntu-1804.yml
index 898348b0..f16a93b0 100644
--- a/spec/acceptance/nodesets/ubuntu-1804.yml
+++ b/spec/acceptance/nodesets/ubuntu-1804.yml
@@ -9,7 +9,7 @@ HOSTS:
     docker_cmd: '["/sbin/init"]'
     docker_image_commands:
       - "rm -f /etc/dpkg/dpkg.cfg.d/excludes"
-      - 'apt-get install -y wget net-tools iproute2 locales apt-transport-https ca-certificates'
+      - 'apt-get install -y wget net-tools iproute2 locales apt-transport-https ca-certificates lsb-release'
       - 'locale-gen en_US.UTF-8'
     docker_env:
       - LANG=en_US.UTF-8