From 55cbccf0fc81daaa50d85c9ea584ddaece5a43d7 Mon Sep 17 00:00:00 2001
From: "patchback[bot]" <45432694+patchback[bot]@users.noreply.github.com>
Date: Tue, 9 May 2023 20:10:00 +0200
Subject: [PATCH] [PR #6478/c740f89d backport][stable-6] CI: Add FreeBSD 13.2
 (#6508)

CI: Add FreeBSD 13.2 (#6478)

* Add FreeBSD 13.2.

* Skip FreeBSD 13.2 for iso_extract tests.

* Fix autoremove test: m4 is no longer a dependency, or it was already installed beforehand.

* Also disable the jail tests for FreeBSD 13.2.

(cherry picked from commit c740f89df38926552ce86ce417a458a4af1a9733)

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

diff --git a/.azure-pipelines/azure-pipelines.yml b/.azure-pipelines/azure-pipelines.yml
index c572faaf30..2d55bb8e55 100644
--- a/.azure-pipelines/azure-pipelines.yml
+++ b/.azure-pipelines/azure-pipelines.yml
@@ -217,8 +217,8 @@ stages:
               test: macos/13.2
             - name: RHEL 9.1
               test: rhel/9.1
-            - name: FreeBSD 13.1
-              test: freebsd/13.1
+            - name: FreeBSD 13.2
+              test: freebsd/13.2
             - name: FreeBSD 12.4
               test: freebsd/12.4
           groups:
@@ -235,6 +235,8 @@ stages:
           targets:
             - name: RHEL 7.9
               test: rhel/7.9
+            - name: FreeBSD 13.1
+              test: freebsd/13.1
           groups:
             - 1
             - 2
diff --git a/tests/integration/targets/iso_extract/aliases b/tests/integration/targets/iso_extract/aliases
index 2815959456..33041456a9 100644
--- a/tests/integration/targets/iso_extract/aliases
+++ b/tests/integration/targets/iso_extract/aliases
@@ -10,3 +10,4 @@ skip/osx  # FIXME
 skip/rhel9.0  # FIXME
 skip/rhel9.1  # FIXME
 skip/freebsd12.4  # FIXME
+skip/freebsd13.2  # FIXME
diff --git a/tests/integration/targets/pkgng/tasks/freebsd.yml b/tests/integration/targets/pkgng/tasks/freebsd.yml
index ac8e974fb3..bac5f62942 100644
--- a/tests/integration/targets/pkgng/tasks/freebsd.yml
+++ b/tests/integration/targets/pkgng/tasks/freebsd.yml
@@ -288,7 +288,6 @@
           - autoconf
           - automake
           - libtool
-          - m4
         state: absent
       check_mode: true
       register: pkgng_example7_cleanup
@@ -296,9 +295,9 @@
     - name: Ensure pkgng autoremove works correctly
       assert:
         that:
-          - pkgng_example7_prepare_install.changed
+          - pkgng_example7_prepare_install is changed
           - "'autoremoved' is in(pkgng_example7.msg)"
-          - not pkgng_example7_cleanup.changed
+          - pkgng_example7_cleanup is not changed
 
 ##
 ## pkgng - example - single annotations
@@ -513,11 +512,14 @@
   # NOTE: FreeBSD 13.1 fails to update the package catalogue for unknown reasons (someone with FreeBSD
   #       knowledge has to take a look)
   #
+  # NOTE: FreeBSD 13.2 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.2', '>=')
+    or ansible_distribution_version is version('13.3', '>=')
   block:
     - name: Setup testjail
       include: setup-testjail.yml