[PR #5782/6fb212b1 backport][stable-6] Update CI matrix (#5798)

Update CI matrix (#5782)

* Update CI matrix.

* Disable RHEL 9.1 for tests where RHEL 9.0 was disabled as well.

* Skip iso_extract on FreeBSD 12.4.

* Fix cloud_init_data_facts test for Fedora 37.

* Do not try to install snap on RHEL 9.1.

* Skip pkgng jail tests on FreeBSD 12.4 as well.

(cherry picked from commit 6fb212b104)

Co-authored-by: Felix Fontein <felix@fontein.de>

.azure-pipelines/azure-pipelines.yml

@@ -197,10 +197,10 @@ stages:
         parameters:
           testFormat: devel/{0}
           targets:
-            - name: Alpine 3.16
+            - name: Alpine 3.17
-              test: alpine/3.16
+              test: alpine/3.17
-            # - name: Fedora 36
+            # - name: Fedora 37
-            #   test: fedora/36
+            #   test: fedora/37
             # - name: Ubuntu 20.04
             #   test: ubuntu/20.04
             - name: Ubuntu 22.04
@@ -219,10 +219,12 @@ stages:
               test: macos/12.0
             - name: RHEL 7.9
               test: rhel/7.9
-            - name: RHEL 9.0
+            - name: RHEL 9.1
-              test: rhel/9.0
+              test: rhel/9.1
             - name: FreeBSD 13.1
               test: freebsd/13.1
+            - name: FreeBSD 12.4
+              test: freebsd/12.4
           groups:
             - 1
             - 2
@@ -305,8 +307,8 @@ stages:
           targets:
             - name: CentOS 7
               test: centos7
-            - name: Fedora 36
+            - name: Fedora 37
-              test: fedora36
+              test: fedora37
             - name: openSUSE 15
               test: opensuse15
             - name: Ubuntu 20.04
@@ -327,8 +329,8 @@ stages:
         parameters:
           testFormat: 2.14/linux/{0}
           targets:
-            - name: Ubuntu 20.04
+            - name: Fedora 36
-              test: ubuntu2004
+              test: fedora36
           groups:
             - 1
             - 2

tests/integration/targets/cloud_init_data_facts/tasks/main.yml

@@ -29,6 +29,12 @@
       - cloud-init
       - udev
 
+  - name: Ensure systemd-network user exists
+    user:
+      name: systemd-network
+      state: present
+    when: ansible_distribution == 'Fedora' and ansible_distribution_major_version|int >= 37
+
   - name: setup run cloud-init
     service:
       name: cloud-init-local

tests/integration/targets/django_manage/aliases

@@ -12,3 +12,4 @@ skip/rhel8.3
 skip/rhel8.4
 skip/rhel8.5
 skip/rhel9.0
+skip/rhel9.1

tests/integration/targets/homectl/aliases

@@ -8,3 +8,4 @@ skip/freebsd
 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/

tests/integration/targets/iso_extract/aliases

@@ -8,3 +8,5 @@ destructive
 skip/aix
 skip/osx  # FIXME
 skip/rhel9.0  # FIXME
+skip/rhel9.1  # FIXME
+skip/freebsd12.4  # FIXME

tests/integration/targets/odbc/aliases

@@ -8,4 +8,5 @@ skip/osx
 skip/macos
 skip/rhel8.0
 skip/rhel9.0
+skip/rhel9.1
 skip/freebsd

tests/integration/targets/pkgng/tasks/freebsd.yml

@@ -501,14 +501,19 @@
   # NOTE: FreeBSD 12.0 test runner receives a "connection reset by peer" after ~20% downloaded so we are
   #       only running this on 12.1 or higher
   #
+  # NOTE: FreeBSD 12.4 fails to update repositories because it cannot load certificates from /usr/share/keys/pkg/trusted
+  #       knowledge has to take a look)
+  #
   # NOTE: FreeBSD 13.0 fails to update the package catalogue for unknown reasons (someone with FreeBSD
   #       knowledge has to take a look)
   #
   # NOTE: FreeBSD 13.1 fails to update the package catalogue for unknown reasons (someone with FreeBSD
   #       knowledge has to take a look)
   #
+  # See also
+  # https://github.com/ansible-collections/community.general/issues/5795
   when: >-
-    (ansible_distribution_version is version('12.01', '>=') and ansible_distribution_version is version('13.0', '<'))
+    (ansible_distribution_version is version('12.01', '>=') and ansible_distribution_version is version('12.4', '<'))
     or ansible_distribution_version is version('13.2', '>=')
   block:
     - name: Setup testjail

tests/integration/targets/setup_snap/tasks/D-RedHat-9.1.yml

@@ -0,0 +1,6 @@
+---
+# 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

tests/integration/targets/ufw/aliases

@@ -10,6 +10,7 @@ skip/macos
 skip/freebsd
 skip/rhel8.0  # FIXME
 skip/rhel9.0  # FIXME
+skip/rhel9.1  # FIXME
 skip/docker
 needs/root
 needs/target/setup_epel