diff --git a/.gitignore b/.gitignore index c6d3f46..52dc670 100644 --- a/.gitignore +++ b/.gitignore @@ -820,3 +820,4 @@ /bootloader-1.0.6.tar.gz /gfs2-0.0.3.tar.gz /sudo-1.0.0.tar.gz +/auto-maintenance-1.79.0.tar.gz diff --git a/containers-podman-quadlet-gpus.patch b/containers-podman-quadlet-gpus.patch new file mode 100644 index 0000000..04b8798 --- /dev/null +++ b/containers-podman-quadlet-gpus.patch @@ -0,0 +1,13 @@ +diff --git a/plugins/module_utils/podman/quadlet.py b/plugins/module_utils/podman/quadlet.py +index 6296c7b..c716d8c 100644 +--- a/plugins/module_utils/podman/quadlet.py ++++ b/plugins/module_utils/podman/quadlet.py +@@ -475,7 +475,7 @@ class PodQuadlet(Quadlet): + for gidmap in params["gidmap"]: + params["podman_args"].append(f"--gidmap {gidmap}") + if params["exit_policy"]: +- params["podman_args"].append(f"--exit-policy={params['gpus']}") ++ params["podman_args"].append(f"--exit-policy={params['exit_policy']}") + if params["gpus"]: + params["podman_args"].append(f"--gpus {params['gpus']}") + if params["hostname"]: diff --git a/extrasources.inc b/extrasources.inc index 4c387e6..b1c52ef 100644 --- a/extrasources.inc +++ b/extrasources.inc @@ -8,3 +8,7 @@ Provides: bundled(ansible-collection(containers.podman)) = 1.15.2 Source996: CHANGELOG.rst Source998: collection_readme.sh + +# remove this when containers.podman contains the fix for +# https://github.com/containers/ansible-podman-collections/pull/784 +Patch903: containers-podman-quadlet-gpus.patch diff --git a/linux-system-roles.spec b/linux-system-roles.spec index fb0a804..e6a737d 100644 --- a/linux-system-roles.spec +++ b/linux-system-roles.spec @@ -24,7 +24,7 @@ Name: linux-system-roles Url: https://github.com/linux-system-roles Summary: Set of interfaces for unified system management Version: 1.79.0 -Release: 0.2%{?dist} +Release: 0.3%{?dist} License: GPLv3+ and MIT and BSD and Python %global _pkglicensedir %{_licensedir}/%{name} @@ -86,7 +86,7 @@ Requires: (ansible-core >= 2.11.0 or ansible >= 2.9.0) %%global rolestodir %%{?rolestodir} %%{roletodir%{1}} } -%global mainid 42955a38fe071d2ac0fc2c99277832d5cb935d71 +%global mainid 1.79.0 Source: %{url}/auto-maintenance/archive/%{mainid}/auto-maintenance-%{mainid}.tar.gz # BEGIN AUTOGENERATED SOURCES @@ -687,6 +687,10 @@ find %{buildroot}%{ansible_roles_dir} -mindepth 1 -maxdepth 1 | \ %endif %changelog +* Wed Jun 12 2024 Rich Megginson - 1.79.0-0.3 +- add patch for https://github.com/containers/ansible-podman-collections/pull/784 + this is blocking gating tests + * Tue Jun 11 2024 Rich Megginson - 1.79.0-0.2 - Resolves: RHEL-39996 : bootloader - Set user.cfg path to /boot/grub2/ on EL 9 UEFI - Resolves: RHEL-35561 : logging - Setup imuxsock using rhel-system-roles.logging causing an error diff --git a/sources b/sources index 0c34ca5..79b06cd 100644 --- a/sources +++ b/sources @@ -1,7 +1,7 @@ SHA512 (ad_integration-1.4.5.tar.gz) = 9cdb9f9a452c77f69082c956dd9734fee6585949f05595549ee04a60e75b1443643faf48ee266fdca521a74da651d9b600625b75658ff0578b268e2213a93a80 SHA512 (ansible-posix-1.5.4.tar.gz) = 63321c2b439bb2c707c5bea2fba61eaefecb0ce1c832c4cfc8ee8bb89448c8af10e447bf580e8ae6d325c0b5891b609683ff2ba46b78040e2c4d3d8b6bdcd724 SHA512 (ansible-sshd-v0.23.5.tar.gz) = 9c4b33ea65b71a913ab7a5efb19877e379d3871ece95369725cb749f969a049c16e7858ce1c7d874a2f634b8287171a6f8cee25c1c8aa641bb025893718f3ea3 -SHA512 (auto-maintenance-42955a38fe071d2ac0fc2c99277832d5cb935d71.tar.gz) = e2c1db38a514fdb2cd51b88e5c769c398e20bbf0624c946f182b4deb283e92d9c19b1e04a1d279f50df3c3a5da5c7aa69e7cee2950ca69244b1131969c44fecb +SHA512 (auto-maintenance-1.79.0.tar.gz) = ab68a545117a039384cc50aa286a83b08f9625b59d48def4b6e4e7bdab31d194001064d4881cce83571d927ad862370a29e4d3572a3fda917e3d994532f6a4d5 SHA512 (bootloader-1.0.6.tar.gz) = 96b50ea0aaf593e77dfa084632422b9595ded3be0b5bafc504be8ea8e022464fed4e1364ec298851e82c35b3d1c5bd4680dfb34d08a31314dc4155b10088d947 SHA512 (certificate-1.3.5.tar.gz) = 0a17e8c79b46ba44e3fa1b0af2148c685a23f65e97641af88ae9a3cbcf8b0b91a1809a9f026d85ca493180476eac243d62fec97bd94236f7bbbab07b61be1a4c SHA512 (cockpit-1.5.7.tar.gz) = 982cef9c598246efdee54f998217cb840b8a8c0d61ccd7fc9d1554cae2e0b808e8d83127254ab005de58fd6e5ab478fec077390c2e6a0aa4704f279703c34283 diff --git a/vendoring-build.inc b/vendoring-build.inc index 4e7e8b1..dedf9e7 100644 --- a/vendoring-build.inc +++ b/vendoring-build.inc @@ -31,6 +31,10 @@ declare -A plugin_map=( sed "s/collection_name='community.general'/collection_name='%{collection_namespace}.%{collection_name}'/" \ -i .external/community/general/plugins/modules/rhsm_repository.py +pushd .external/containers/podman +%patch903 -p1 +popd + fix_module_documentation() { local module_src doc_fragment_name df_dest_dir local -a paths