From 126c4fad21e8e2aefe116ab1c7dfad9d6ccc50cc Mon Sep 17 00:00:00 2001
From: Rich Megginson <rmeggins@redhat.com>
Date: Thu, 25 Apr 2024 17:12:13 -0600
Subject: [PATCH] system roles 1.78.1-0.1

fix some issues with ansible-test

(cherry picked from commit 6c426ed0ed7059c7ff91cc71f91f3f4f97c66f31)
---
 .gitignore              |  2 ++
 linux-system-roles.spec |  9 ++++++---
 sources                 |  4 ++--
 vendoring-build.inc     | 36 +++++++++++++++++++++++++++++-------
 4 files changed, 39 insertions(+), 12 deletions(-)

diff --git a/.gitignore b/.gitignore
index 386ac78..a9e71f5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,3 +41,5 @@
 /auto-maintenance-1.78.0.tar.gz
 /gfs2-0.0.1.tar.gz
 /containers-podman-1.13.0.tar.gz
+/firewall-1.7.6.tar.gz
+/gfs2-0.0.2.tar.gz
diff --git a/linux-system-roles.spec b/linux-system-roles.spec
index b0eb4e1..214d8a6 100644
--- a/linux-system-roles.spec
+++ b/linux-system-roles.spec
@@ -23,7 +23,7 @@ Name: linux-system-roles
 %endif
 Url: https://github.com/linux-system-roles
 Summary: Set of interfaces for unified system management
-Version: 1.78.0
+Version: 1.78.1
 Release: 0.1%{?dist}
 
 License: GPLv3+ and MIT and BSD and Python
@@ -147,7 +147,7 @@ Source: %{url}/auto-maintenance/archive/%{mainid}/auto-maintenance-%{mainid}.tar
 %deftag 18 1.6.4
 
 %global rolename19 firewall
-%deftag 19 1.7.5
+%deftag 19 1.7.6
 
 %global rolename20 cockpit
 %deftag 20 1.5.6
@@ -183,7 +183,7 @@ Source: %{url}/auto-maintenance/archive/%{mainid}/auto-maintenance-%{mainid}.tar
 %deftag 30 1.3.2
 
 %global rolename31 gfs2
-%deftag 31 0.0.1
+%deftag 31 0.0.2
 
 Source1: %{archiveurl1}
 Source2: %{archiveurl2}
@@ -689,6 +689,9 @@ find %{buildroot}%{ansible_roles_dir} -mindepth 1 -maxdepth 1 | \
 %endif
 
 %changelog
+* Thu Apr 25 2024 Rich Megginson <rmeggins@redhat.com> - 1.78.1-0.1
+- fix some issues with ansible-test
+
 * Thu Apr 25 2024 Rich Megginson <rmeggins@redhat.com> - 1.78.0-0.1
 - Resolves: RHEL-34214 : gfs2 - New Role
 
diff --git a/sources b/sources
index 5419b7a..323d2c0 100644
--- a/sources
+++ b/sources
@@ -9,8 +9,8 @@ SHA512 (community-general-8.6.0.tar.gz) = 4b499dc6bbc0a9ad5865d1ca03b042a73ab8b7
 SHA512 (containers-podman-1.13.0.tar.gz) = d5235f6b35d9653cdf067b688cb6eb7f15ee6fd56d81a82a2047801b8109fce8639dbdd64bc903f8ee85ad2a3ced1051c6f8a3fe39b0b7dd6d8c1320da01d718
 SHA512 (crypto_policies-1.3.3.tar.gz) = 0bd3bc2d129dcad06d26bee6a5ea9296968f2885ca907d80b7cf4e12141eb3e2e47a7418aaa72e84df7d1642bb0c3d60c9bea2c8bed4a6d5be560467ecb59ba8
 SHA512 (fapolicyd-1.1.2.tar.gz) = 06c01c7bc55fe288b50cde101ea51a1cd78c93fbc58b6eafab2f5aeccdd68938d7aa45e5dbcb513583bcf1ada045837f80d5305e63c9fc0be1ec0ec4e4fbc792
-SHA512 (firewall-1.7.5.tar.gz) = 94bbf05b7796eb91c67bfec8eb6029c56893d5a5da186ed4881d3fe9f3473ebd1fe102f99370c7ee867b1537b286d12cf65bcbf9dfe77d592954ad11367ab781
-SHA512 (gfs2-0.0.1.tar.gz) = 622815d777d045bee52d6f762b4bde045306ac988f47f640bc8a40b203b8f5552e98c0fd95988556bd7fc2c09baf733b8d84e1a06fe96c6c6d4f368e534f89d0
+SHA512 (firewall-1.7.6.tar.gz) = fda1af2e39a30a2a922816d1a9305b1eace8cd115f3f0244b40df0a9c3a560303c8386d332034493bafdad7bbbd1bae2ffdaf57276ebca817d3adbd6feab8436
+SHA512 (gfs2-0.0.2.tar.gz) = 92a55b50118a3085a40948b6ef276092abb3e12d55d4cd820ee4b4a2a41876ab39e057005b07dd0f4564cf94a8ddd9f6f0bec645754aedc423d78635d4cdc5a4
 SHA512 (ha_cluster-1.17.0.tar.gz) = 74f1f6dcdcfc79a6fcc1a6fc747ea6330b322f8128d0f7a60efbb792b079c246d6b5e144389440cadb908d65b3f3dd0c6864ee3879cfe72f7f423134716dda2a
 SHA512 (journald-1.3.0.tar.gz) = 979d89c3e6b4e7210d92d47e2518f212ad3f869c2272f5a4a23a0bf468d74a28b7a42c9811cc3b5531d57936f3459d6b5a7f102945d98b958ccecae22e600908
 SHA512 (kdump-1.4.5.tar.gz) = 64e37b0f28142c903a162c1892f09b4d0c7224f2305a6b422a2d5aae351172b0c3a7cb8f942f1ff6b651a73e983618d0b9e2ce6080af7df37e9855a2e4ffc2c0
diff --git a/vendoring-build.inc b/vendoring-build.inc
index 1db447e..4e7e8b1 100644
--- a/vendoring-build.inc
+++ b/vendoring-build.inc
@@ -22,6 +22,7 @@ declare -A plugin_map=(
   [containers/podman/plugins/modules/podman_play.py]=podman
   [containers/podman/plugins/modules/podman_secret.py]=podman
   [containers/podman/plugins/module_utils/podman/common.py]=podman
+  [containers/podman/plugins/module_utils/podman/quadlet.py]=podman
 )
 
 # fix the following issue
@@ -120,11 +121,32 @@ done
 # for podman, change the FQCN - using a non-FQCN module name doesn't seem to work,
 # even for the legacy role format
 for rolename in %{rolenames}; do
-    find "$rolename" -type f -exec \
-         sed -e "s/linux-system-roles[.]${rolename}\\>/%{roleinstprefix}${rolename}/g" \
-             -e "s/fedora[.]linux_system_roles[.]/%{collection_namespace}.%{collection_name}./g" \
-             -e "s/containers[.]podman[.]/%{collection_namespace}.%{collection_name}./g" \
-             -e "s/community[.]general[.]/%{collection_namespace}.%{collection_name}./g" \
-             -e "s/ansible[.]posix[.]/%{collection_namespace}.%{collection_name}./g" \
-             -i {} \;
+  find "$rolename" -type f -exec \
+    sed -e "s/linux-system-roles[.]${rolename}\\>/%{roleinstprefix}${rolename}/g" \
+        -e "s/fedora[.]linux_system_roles[.]/%{collection_namespace}.%{collection_name}./g" \
+        -e "s/containers[.]podman[.]/%{collection_namespace}.%{collection_name}./g" \
+        -e "s/community[.]general[.]/%{collection_namespace}.%{collection_name}./g" \
+        -e "s/ansible[.]posix[.]/%{collection_namespace}.%{collection_name}./g" \
+        -i {} \;
+done
+
+# add ansible-test ignores needed due to vendoring
+for ansible_ver in 2.14 2.15 2.16; do
+  ignore_file="podman/.sanity-ansible-ignore-${ansible_ver}.txt"
+  cat >> "$ignore_file" <<EOF
+plugins/module_utils/podman_lsr/podman/quadlet.py compile-2.7!skip
+plugins/module_utils/podman_lsr/podman/quadlet.py import-2.7!skip
+plugins/modules/podman_image.py import-2.7!skip
+plugins/modules/podman_play.py import-2.7!skip
+EOF
+done
+# these platforms still use python 3.5
+for ansible_ver in 2.14 2.15; do
+  ignore_file="podman/.sanity-ansible-ignore-${ansible_ver}.txt"
+  cat >> "$ignore_file" <<EOF
+plugins/module_utils/podman_lsr/podman/quadlet.py compile-3.5!skip
+plugins/module_utils/podman_lsr/podman/quadlet.py import-3.5!skip
+plugins/modules/podman_image.py import-3.5!skip
+plugins/modules/podman_play.py import-3.5!skip
+EOF
 done