From 068a799bbaafdf9f20ee5402e91f951430601567 Mon Sep 17 00:00:00 2001
From: Felix Fontein <felix@fontein.de>
Date: Mon, 19 Jun 2023 23:49:33 +0200
Subject: [PATCH] Add RHEL 8.7, 8.8, and 9.2 to CI (#6739)

* Add RHEL 8.7, 8.8, and 9.2 to CI.

* Add more ignores.

* Disable another test.
---
 .azure-pipelines/azure-pipelines.yml                   | 10 ++++++++--
 tests/integration/targets/django_manage/aliases        |  4 ++++
 tests/integration/targets/homectl/aliases              |  1 +
 tests/integration/targets/iso_extract/aliases          |  1 +
 tests/integration/targets/odbc/aliases                 |  1 +
 .../targets/setup_snap/tasks/D-RedHat-9.1.yml          |  7 +------
 .../targets/setup_snap/tasks/D-RedHat-9.2.yml          |  1 +
 tests/integration/targets/ufw/aliases                  |  1 +
 8 files changed, 18 insertions(+), 8 deletions(-)
 mode change 100644 => 120000 tests/integration/targets/setup_snap/tasks/D-RedHat-9.1.yml
 create mode 120000 tests/integration/targets/setup_snap/tasks/D-RedHat-9.2.yml

diff --git a/.azure-pipelines/azure-pipelines.yml b/.azure-pipelines/azure-pipelines.yml
index 07da255893..428b8f7473 100644
--- a/.azure-pipelines/azure-pipelines.yml
+++ b/.azure-pipelines/azure-pipelines.yml
@@ -189,8 +189,10 @@ stages:
           targets:
             - name: macOS 13.2
               test: macos/13.2
-            - name: RHEL 9.1
-              test: rhel/9.1
+            - name: RHEL 9.2
+              test: rhel/9.2
+            - name: RHEL 8.8
+              test: rhel/8.8
             - name: FreeBSD 13.2
               test: freebsd/13.2
             - name: FreeBSD 12.4
@@ -207,6 +209,10 @@ stages:
         parameters:
           testFormat: 2.15/{0}
           targets:
+            - name: RHEL 9.1
+              test: rhel/9.1
+            - name: RHEL 8.7
+              test: rhel/8.7
             - name: RHEL 7.9
               test: rhel/7.9
             - name: FreeBSD 13.1
diff --git a/tests/integration/targets/django_manage/aliases b/tests/integration/targets/django_manage/aliases
index 98aed9e9d4..f921242f48 100644
--- a/tests/integration/targets/django_manage/aliases
+++ b/tests/integration/targets/django_manage/aliases
@@ -11,5 +11,9 @@ skip/rhel8.2
 skip/rhel8.3
 skip/rhel8.4
 skip/rhel8.5
+skip/rhel8.6
+skip/rhel8.7
+skip/rhel8.8
 skip/rhel9.0
 skip/rhel9.1
+skip/rhel9.2
diff --git a/tests/integration/targets/homectl/aliases b/tests/integration/targets/homectl/aliases
index b87db2e43c..956aa8056e 100644
--- a/tests/integration/targets/homectl/aliases
+++ b/tests/integration/targets/homectl/aliases
@@ -9,3 +9,4 @@ skip/osx
 skip/macos
 skip/rhel9.0  # See https://www.reddit.com/r/Fedora/comments/si7nzk/homectl/
 skip/rhel9.1  # See https://www.reddit.com/r/Fedora/comments/si7nzk/homectl/
+skip/rhel9.2  # See https://www.reddit.com/r/Fedora/comments/si7nzk/homectl/
diff --git a/tests/integration/targets/iso_extract/aliases b/tests/integration/targets/iso_extract/aliases
index 33041456a9..8d11f3d6e8 100644
--- a/tests/integration/targets/iso_extract/aliases
+++ b/tests/integration/targets/iso_extract/aliases
@@ -9,5 +9,6 @@ skip/aix
 skip/osx  # FIXME
 skip/rhel9.0  # FIXME
 skip/rhel9.1  # FIXME
+skip/rhel9.2  # FIXME
 skip/freebsd12.4  # FIXME
 skip/freebsd13.2  # FIXME
diff --git a/tests/integration/targets/odbc/aliases b/tests/integration/targets/odbc/aliases
index e8465c50e8..987ebab24e 100644
--- a/tests/integration/targets/odbc/aliases
+++ b/tests/integration/targets/odbc/aliases
@@ -9,4 +9,5 @@ skip/macos
 skip/rhel8.0
 skip/rhel9.0
 skip/rhel9.1
+skip/rhel9.2
 skip/freebsd
diff --git a/tests/integration/targets/setup_snap/tasks/D-RedHat-9.1.yml b/tests/integration/targets/setup_snap/tasks/D-RedHat-9.1.yml
deleted file mode 100644
index 5bbfaff128..0000000000
--- a/tests/integration/targets/setup_snap/tasks/D-RedHat-9.1.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-# Copyright (c) Ansible Project
-# GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-# Do nothing
diff --git a/tests/integration/targets/setup_snap/tasks/D-RedHat-9.1.yml b/tests/integration/targets/setup_snap/tasks/D-RedHat-9.1.yml
new file mode 120000
index 0000000000..0b06951496
--- /dev/null
+++ b/tests/integration/targets/setup_snap/tasks/D-RedHat-9.1.yml
@@ -0,0 +1 @@
+nothing.yml
\ No newline at end of file
diff --git a/tests/integration/targets/setup_snap/tasks/D-RedHat-9.2.yml b/tests/integration/targets/setup_snap/tasks/D-RedHat-9.2.yml
new file mode 120000
index 0000000000..0b06951496
--- /dev/null
+++ b/tests/integration/targets/setup_snap/tasks/D-RedHat-9.2.yml
@@ -0,0 +1 @@
+nothing.yml
\ No newline at end of file
diff --git a/tests/integration/targets/ufw/aliases b/tests/integration/targets/ufw/aliases
index 2ef1a41338..92d3fa6187 100644
--- a/tests/integration/targets/ufw/aliases
+++ b/tests/integration/targets/ufw/aliases
@@ -11,6 +11,7 @@ skip/freebsd
 skip/rhel8.0  # FIXME
 skip/rhel9.0  # FIXME
 skip/rhel9.1  # FIXME
+skip/rhel9.2  # FIXME
 skip/docker
 needs/root
 needs/target/setup_epel