From 49765f103b8d8ec6a385598ab00b685d6758f938 Mon Sep 17 00:00:00 2001
From: "patchback[bot]" <45432694+patchback[bot]@users.noreply.github.com>
Date: Sat, 22 Jun 2024 10:48:45 +0200
Subject: [PATCH] [PR #8550/9e381614 backport][stable-9] CI: Replace FreeBSD
 14.0 with 14.1; add 14.0 for stable-2.17 (#8552)

CI: Replace FreeBSD 14.0 with 14.1; add 14.0 for stable-2.17 (#8550)

* Replace FreeBSD 14.0 with 14.1; add 14.0 for stable-2.17.

* Skip tests that do not work.

(cherry picked from commit 9e38161400be6d9f1e28f4674d8c99786a34acbc)

Co-authored-by: Felix Fontein <felix@fontein.de>
---
 .azure-pipelines/azure-pipelines.yml              | 6 ++++--
 tests/integration/targets/filter_jc/aliases       | 1 +
 tests/integration/targets/iso_extract/aliases     | 1 +
 tests/integration/targets/pkgng/tasks/freebsd.yml | 5 ++++-
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/.azure-pipelines/azure-pipelines.yml b/.azure-pipelines/azure-pipelines.yml
index aee822043f..7c6470b8da 100644
--- a/.azure-pipelines/azure-pipelines.yml
+++ b/.azure-pipelines/azure-pipelines.yml
@@ -194,8 +194,8 @@ stages:
               test: macos/14.3
             - name: RHEL 9.4
               test: rhel/9.4
-            - name: FreeBSD 14.0
-              test: freebsd/14.0
+            - name: FreeBSD 14.1
+              test: freebsd/14.1
           groups:
             - 1
             - 2
@@ -212,6 +212,8 @@ stages:
               test: freebsd/13.3
             - name: RHEL 9.3
               test: rhel/9.3
+            - name: FreeBSD 14.0
+              test: freebsd/14.0
           groups:
             - 1
             - 2
diff --git a/tests/integration/targets/filter_jc/aliases b/tests/integration/targets/filter_jc/aliases
index 4e11515666..a39321e96d 100644
--- a/tests/integration/targets/filter_jc/aliases
+++ b/tests/integration/targets/filter_jc/aliases
@@ -6,3 +6,4 @@ azp/posix/2
 skip/python2.7  # jc only supports python3.x
 skip/freebsd13.3  # FIXME - ruyaml compilation fails
 skip/freebsd14.0  # FIXME - ruyaml compilation fails
+skip/freebsd14.1  # FIXME - ruyaml compilation fails
diff --git a/tests/integration/targets/iso_extract/aliases b/tests/integration/targets/iso_extract/aliases
index 68cc0db486..27e07941a5 100644
--- a/tests/integration/targets/iso_extract/aliases
+++ b/tests/integration/targets/iso_extract/aliases
@@ -16,3 +16,4 @@ skip/freebsd12.4  # FIXME
 skip/freebsd13.2  # FIXME
 skip/freebsd13.3  # FIXME
 skip/freebsd14.0  # FIXME
+skip/freebsd14.1  # FIXME
diff --git a/tests/integration/targets/pkgng/tasks/freebsd.yml b/tests/integration/targets/pkgng/tasks/freebsd.yml
index 9d4ecf8bb2..e69d26c20d 100644
--- a/tests/integration/targets/pkgng/tasks/freebsd.yml
+++ b/tests/integration/targets/pkgng/tasks/freebsd.yml
@@ -521,12 +521,15 @@
   # NOTE: FreeBSD 14.0 fails to update the package catalogue for unknown reasons (someone with FreeBSD
   #       knowledge has to take a look)
   #
+  # NOTE: FreeBSD 14.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('12.3', '<'))
     or (ansible_distribution_version is version('13.4', '>=') and ansible_distribution_version is version('14.0', '<'))
-    or ansible_distribution_version is version('14.1', '>=')
+    or ansible_distribution_version is version('14.2', '>=')
   block:
     - name: Setup testjail
       include_tasks: setup-testjail.yml