import rhel-system-roles-1.21.0-0.15.el8

2023-01-28 06:13:40 +00:00 · 2023-01-28 06:13:40 +00:00 · 44300b399e
parent d2a6deef30
commit 44300b399e
7 changed files with 116 additions and 182 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,26 +1,26 @@
-SOURCES/ad_integration-1.0.0.tar.gz
-SOURCES/ansible-posix-1.4.0.tar.gz
-SOURCES/ansible-sshd-v0.18.0.tar.gz
-SOURCES/auto-maintenance-e3ac549bee05349d7ae033971448f861415ad608.tar.gz
-SOURCES/certificate-1.1.6.tar.gz
-SOURCES/cockpit-1.4.2.tar.gz
+SOURCES/ad_integration-1.0.1.tar.gz
+SOURCES/ansible-posix-1.5.1.tar.gz
+SOURCES/ansible-sshd-v0.18.1.tar.gz
+SOURCES/auto-maintenance-d6a8e0167e9ed8d089093b7ead1e298241b534e1.tar.gz
+SOURCES/certificate-1.1.8.tar.gz
+SOURCES/cockpit-1.4.3.tar.gz
 SOURCES/community-general-6.2.0.tar.gz
 SOURCES/containers-podman-1.10.1.tar.gz
-SOURCES/crypto_policies-1.2.6.tar.gz
-SOURCES/firewall-1.4.1.tar.gz
+SOURCES/crypto_policies-1.2.7.tar.gz
+SOURCES/firewall-1.4.2.tar.gz
 SOURCES/ha_cluster-1.8.5.tar.gz
-SOURCES/kdump-1.2.5.tar.gz
-SOURCES/kernel_settings-1.1.10.tar.gz
-SOURCES/logging-1.11.4.tar.gz
-SOURCES/metrics-1.8.0.tar.gz
+SOURCES/kdump-1.2.6.tar.gz
+SOURCES/kernel_settings-1.1.11.tar.gz
+SOURCES/logging-1.11.5.tar.gz
+SOURCES/metrics-1.8.1.tar.gz
 SOURCES/nbde_client-1.2.8.tar.gz
-SOURCES/nbde_server-1.3.0.tar.gz
-SOURCES/network-1.11.0.tar.gz
-SOURCES/podman-1.1.0.tar.gz
-SOURCES/postfix-1.3.1.tar.gz
-SOURCES/selinux-1.5.0.tar.gz
-SOURCES/ssh-1.1.11.tar.gz
-SOURCES/storage-1.9.4.tar.gz
-SOURCES/timesync-1.7.1.tar.gz
-SOURCES/tlog-1.2.10.tar.gz
-SOURCES/vpn-1.5.2.tar.gz
+SOURCES/nbde_server-1.3.2.tar.gz
+SOURCES/network-1.11.1.tar.gz
+SOURCES/podman-1.1.1.tar.gz
+SOURCES/postfix-1.3.3.tar.gz
+SOURCES/selinux-1.5.1.tar.gz
+SOURCES/ssh-1.1.12.tar.gz
+SOURCES/storage-1.9.5.tar.gz
+SOURCES/timesync-1.7.2.tar.gz
+SOURCES/tlog-1.2.11.tar.gz
+SOURCES/vpn-1.5.3.tar.gz
--- a/.rhel-system-roles.metadata
+++ b/.rhel-system-roles.metadata
@ -1,26 +1,26 @@
-e7ccb7b1a2f66be5d9a1500c4fe3d18b434f95af SOURCES/ad_integration-1.0.0.tar.gz
-e699d31bfa020050818f133b7c65a49d2e459178 SOURCES/ansible-posix-1.4.0.tar.gz
-845ae09c2643c59aafff61a1ded9ccca114f5255 SOURCES/ansible-sshd-v0.18.0.tar.gz
-d7aa4c69b339bf109227ea9c289b242a808ca0f5 SOURCES/auto-maintenance-e3ac549bee05349d7ae033971448f861415ad608.tar.gz
-25e2045c8fc9d6455d7c5b0c7d32d4976ebc5178 SOURCES/certificate-1.1.6.tar.gz
-3a9049ce1802f288df9e3550e2413faa509583ae SOURCES/cockpit-1.4.2.tar.gz
+4f5c92974541d578dbd1bfa81b3770d9b15c4663 SOURCES/ad_integration-1.0.1.tar.gz
+f36cb7b1662ecda55c27f5bc15e0a22a1f11a361 SOURCES/ansible-posix-1.5.1.tar.gz
+71c988d6ad9b916727cd93b8e2a2154183f5035a SOURCES/ansible-sshd-v0.18.1.tar.gz
+a59d5ba01d5e536e800bc847528f16c16b961375 SOURCES/auto-maintenance-d6a8e0167e9ed8d089093b7ead1e298241b534e1.tar.gz
+24c685461ea8c874a8b6427abab71f187528a714 SOURCES/certificate-1.1.8.tar.gz
+05148744a2d69d469dc3c678bb1a9fb9747dea26 SOURCES/cockpit-1.4.3.tar.gz
 3e4ef8fa268793a8e8ef48291571ff8e5d0b8f95 SOURCES/community-general-6.2.0.tar.gz
 ccb070885fd455bb6e7f2b8ca050d40d30609fec SOURCES/containers-podman-1.10.1.tar.gz
-56bc0763e0b549c3499a80e95d0953ee6769136a SOURCES/crypto_policies-1.2.6.tar.gz
-c7dedc3157260d205429bed8d8956f2d0590906d SOURCES/firewall-1.4.1.tar.gz
+47e3a2db8790c98fd5c09ab1887318b6ba56ce49 SOURCES/crypto_policies-1.2.7.tar.gz
+1c414411b4960040eebcef2ddd528eea0b47f05f SOURCES/firewall-1.4.2.tar.gz
 1741e0a109ad63297f4ce1bd6425bd904912f11f SOURCES/ha_cluster-1.8.5.tar.gz
-6ae0614d51db00957943fad6967674c0de88862c SOURCES/kdump-1.2.5.tar.gz
-17f28f701d7842499b232a7b28daae5f51ea631b SOURCES/kernel_settings-1.1.10.tar.gz
-dfbe3c7748362f08243eb6fe7d7f02faf6f89531 SOURCES/logging-1.11.4.tar.gz
-2304e3ecdb5abf31264766bdfd65f93b9a127843 SOURCES/metrics-1.8.0.tar.gz
+439ea600c242c914c90933f287f3caf8c7869c12 SOURCES/kdump-1.2.6.tar.gz
+49f4bc8f273339cde0cdecccffa7b902359b2601 SOURCES/kernel_settings-1.1.11.tar.gz
+7fe83b26f954e55a282a4d5398e3064a7783a83a SOURCES/logging-1.11.5.tar.gz
+e217af697b4e3205177360726f579d01b145be77 SOURCES/metrics-1.8.1.tar.gz
 f8f356eca3840f6eb8c51d7fe1045df9e0651149 SOURCES/nbde_client-1.2.8.tar.gz
-c3cce92d9b9465497d9fe4cf635a32b50dfd4f8d SOURCES/nbde_server-1.3.0.tar.gz
-b1cdfa2cf4a1b2eb552f6fe6380666902c0be2f6 SOURCES/network-1.11.0.tar.gz
-1a5c733f97355048e7dc71e22b3a5657f60108dd SOURCES/podman-1.1.0.tar.gz
-345ad289065728cb1322bdbd9dca7cb4d393d384 SOURCES/postfix-1.3.1.tar.gz
-cca65506d7e747cd111fdd4397b60536a5d98dbd SOURCES/selinux-1.5.0.tar.gz
-8337034363ca9fc684cfeb7fc9f3028a5f72f45f SOURCES/ssh-1.1.11.tar.gz
-4960a22068aa401abbb73f1f9a6e391f859d2db5 SOURCES/storage-1.9.4.tar.gz
-6e452d26346f53bf715b57f530995fc078cd8cf8 SOURCES/timesync-1.7.1.tar.gz
-da1b76816153f072fb2a6f849e63bc8255d8dd11 SOURCES/tlog-1.2.10.tar.gz
-884ee8d0ae926a91e4a39e1eac2eaab55324df87 SOURCES/vpn-1.5.2.tar.gz
+10e33928bf31fb2cb34f9b97829c359676ca5fc3 SOURCES/nbde_server-1.3.2.tar.gz
+619b8b44b622f373fdc899bb4e12abb6a0839df0 SOURCES/network-1.11.1.tar.gz
+c956e14c6b4c1e7e434024a667f80bd2f196d350 SOURCES/podman-1.1.1.tar.gz
+9244301089661fecca31dfee431b32d4876063be SOURCES/postfix-1.3.3.tar.gz
+494f4157f3abf1a74ba175913f35afea15492709 SOURCES/selinux-1.5.1.tar.gz
+1bb35bc413249ce3209e471687afd60e0e25dddb SOURCES/ssh-1.1.12.tar.gz
+c71f04860a31657005fcb1948f57ac060928a796 SOURCES/storage-1.9.5.tar.gz
+fefc5b4bd9635bb8fe70a9af9fc178cb5d3e8193 SOURCES/timesync-1.7.2.tar.gz
+07c42ba749c110a87469a5c477579582c4d0c538 SOURCES/tlog-1.2.11.tar.gz
+5b5ee7283092a16e9ec1aba47ee651274f784416 SOURCES/vpn-1.5.3.tar.gz
--- a/SOURCES/CHANGELOG.md
+++ b/SOURCES/CHANGELOG.md
@ -1,6 +1,17 @@
 Changelog
 =========

+[1.21.0-0.15] - 2023-01-20
+----------------------------
+
+### New Features
+
+- none
+
+### Bug Fixes
+
+- none
+
 [1.21.0-0.14] - 2023-01-13
 ----------------------------

--- a/SOURCES/extrasources.inc
+++ b/SOURCES/extrasources.inc
@ -0,0 +1,10 @@
+Source801: https://galaxy.ansible.com/download/ansible-posix-1.5.1.tar.gz
+Source901: https://galaxy.ansible.com/download/community-general-6.2.0.tar.gz
+Source902: https://galaxy.ansible.com/download/containers-podman-1.10.1.tar.gz
+
+Provides: bundled(ansible-collection(ansible.posix)) = 1.5.1
+Provides: bundled(ansible-collection(community.general)) = 6.2.0
+Provides: bundled(ansible-collection(containers.podman)) = 1.10.1
+
+Source996: CHANGELOG.rst
+Source998: collection_readme.sh
--- a/SOURCES/network-disable-bondtests.diff
+++ b/SOURCES/network-disable-bondtests.diff
@ -1,65 +0,0 @@
-From d6c8319f52f3859b28044841063adf0013df878b Mon Sep 17 00:00:00 2001
-From: Rich Megginson <rmeggins@redhat.com>
-Date: Thu, 25 Mar 2021 13:57:45 -0600
-Subject: [PATCH 3/4] Patch53: network-disable-bondtests.diff
-
---
- tests/playbooks/tests_bond.yml              | 2 ++
- tests/playbooks/tests_bond_deprecated.yml   | 2 ++
- tests/tests_bond_deprecated_initscripts.yml | 1 +
- tests/tests_bond_initscripts.yml            | 1 +
- 4 files changed, 6 insertions(+)
-
-diff --git a/tests/playbooks/tests_bond.yml b/tests/playbooks/tests_bond.yml
-index 1e45788..d3005a6 100644
--- a/tests/playbooks/tests_bond.yml
-+++ b/tests/playbooks/tests_bond.yml
-@@ -8,6 +8,8 @@
-     dhcp_interface1: test1
-     port2_profile: bond0.1
-     dhcp_interface2: test2
-+  tags:
-+    - "tests::expfail"
-   tasks:
-     - name: "INIT Prepare setup"
-       debug:
-diff --git a/tests/playbooks/tests_bond_deprecated.yml b/tests/playbooks/tests_bond_deprecated.yml
-index f37e19a..ae475c4 100644
--- a/tests/playbooks/tests_bond_deprecated.yml
-+++ b/tests/playbooks/tests_bond_deprecated.yml
-@@ -8,6 +8,8 @@
-     dhcp_interface1: test1
-     port2_profile: bond0.1
-     dhcp_interface2: test2
-+  tags:
-+    - "tests::expfail"
-   tasks:
-     - name: "INIT Prepare setup"
-       debug:
-diff --git a/tests/tests_bond_deprecated_initscripts.yml b/tests/tests_bond_deprecated_initscripts.yml
-index 383b488..cdf3de0 100644
--- a/tests/tests_bond_deprecated_initscripts.yml
-+++ b/tests/tests_bond_deprecated_initscripts.yml
-@@ -10,6 +10,7 @@
-         network_provider: initscripts
-       tags:
-         - always
-+        - "tests::expfail"
- 
- - import_playbook: playbooks/tests_bond_deprecated.yml
-   when: (ansible_distribution in ['CentOS','RedHat'] and
-diff --git a/tests/tests_bond_initscripts.yml b/tests/tests_bond_initscripts.yml
-index 8fa74c5..6a231c4 100644
--- a/tests/tests_bond_initscripts.yml
-+++ b/tests/tests_bond_initscripts.yml
-@@ -10,6 +10,7 @@
-         network_provider: initscripts
-       tags:
-         - always
-+        - "tests::expfail"
- 
- - import_playbook: playbooks/tests_bond.yml
-   when: (ansible_distribution in ['CentOS','RedHat'] and
-- 
-2.30.2
-
--- a/SOURCES/spec-to-changelog-md.sh
+++ b/SOURCES/spec-to-changelog-md.sh
--- a/SPECS/rhel-system-roles.spec
+++ b/SPECS/rhel-system-roles.spec
@ -30,7 +30,7 @@ Name: linux-system-roles
 Url: https://github.com/linux-system-roles
 Summary: Set of interfaces for unified system management
 Version: 1.21.0
-Release: 0.14%{?dist}
+Release: 0.15%{?dist}

 License: GPLv3+ and MIT and BSD and Python
 %global _pkglicensedir %{_licensedir}/%{name}
@ -107,96 +107,81 @@ Requires: (ansible-core >= 2.11.0 or ansible >= 2.9.0)
 %%global rolestodir %%{?rolestodir} %%{roletodir%{1}}
 }

-#%%defcommit 1 14314822b529520ac12964e0d2938c4bb18ab895
+%global mainid d6a8e0167e9ed8d089093b7ead1e298241b534e1
+Source: %{url}/auto-maintenance/archive/%{mainid}/auto-maintenance-%{mainid}.tar.gz
+
+# BEGIN AUTOGENERATED SOURCES
 %global rolename1 postfix
-%deftag 1 1.3.1
+%deftag 1 1.3.3

-#%%defcommit 2 9fe6eb36772e83b53dcfb8ceb73608fd4f72eeda
 %global rolename2 selinux
-%deftag 2 1.5.0
+%deftag 2 1.5.1

-#%%defcommit 3 cbe4bf262bffae3bf53e531662237741954c4182
 %global rolename3 timesync
-%deftag 3 1.7.1
+%deftag 3 1.7.2

-#%%defcommit 4 02fc72b482e165472624b2f68eecd2ddce1d93b1
 %global rolename4 kdump
-%deftag 4 1.2.5
+%deftag 4 1.2.6

-#%%defcommit 5 a74092634adfe45f76cf761138abab1811692b4b
 %global rolename5 network
-%deftag 5 1.11.0
+%deftag 5 1.11.1

-#%%defcommit 6 d7c5eac5d289f141e55ae330d4584eb26fabde39
 %global rolename6 storage
-%deftag 6 1.9.4
+%deftag 6 1.9.5

-#%%defcommit 7 d57caa8ca506d8cbc7ca0f96f7cb62b7e965f163
 %global rolename7 metrics
-%deftag 7 1.8.0
+%deftag 7 1.8.1

-#%%defcommit 8 2b9e53233ee3a68bdb532e62f289733e436a6106
 %global rolename8 tlog
-%deftag 8 1.2.10
+%deftag 8 1.2.11

-#%%defcommit 9 9373303b98e09ef38df7afc8d06e5e55812096c7
 %global rolename9 kernel_settings
-%deftag 9 1.1.10
+%deftag 9 1.1.11

-#%%defcommit 10 8330de7e6f0606b1c79999ec4c5f319c6bc80640
 %global rolename10 logging
-%deftag 10 1.11.4
+%deftag 10 1.11.5

-#%%defcommit 11 c57d0b1f3384c525738fa26ba4bdca485e162567
 %global rolename11 nbde_server
-%deftag 11 1.3.0
+%deftag 11 1.3.2

-#%%defcommit 12 bef2fad5e365712d1f40e53662490ba2550a253f
 %global rolename12 nbde_client
 %deftag 12 1.2.8

-#%%defcommit 13 310fc53db04e8d3134524afb7a89b0477a2ffb83
 %global rolename13 certificate
-%deftag 13 1.1.6
+%deftag 13 1.1.8

-#%%defcommit 14 b2a9857ac661fa32e66666e444b73bfdb34cdf95
 %global rolename14 crypto_policies
-%deftag 14 1.2.6
+%deftag 14 1.2.7

 %global forgeorg15 https://github.com/willshersystems
 %global repo15 ansible-sshd
 %global rolename15 sshd
-#%%defcommit 15 9766d9097a87a130d4c8abde2247aaad5c925ecf
-%deftag 15 v0.18.0
+%deftag 15 v0.18.1

-#%%defcommit 16 59b9fd7b25607d8bd33bdb082748955f2652846a
 %global rolename16 ssh
-%deftag 16 1.1.11
+%deftag 16 1.1.12

-#%%defcommit 17 f901239cb91878719c9e7461760ef8d4789d626d
 %global rolename17 ha_cluster
 %deftag 17 1.8.5

-#%%defcommit 18 d21c896c0d5de83ec3a92d6adf8d14f0324803ca
 %global rolename18 vpn
-%deftag 18 1.5.2
+%deftag 18 1.5.3

 %global rolename19 firewall
-%deftag 19 1.4.1
+%deftag 19 1.4.2

-#%%defcommit 20 7e30ef9672ffd1d1daa9c8a6939ca63b3b503b5a
 %global rolename20 cockpit
-%deftag 20 1.4.2
+%deftag 20 1.4.3

 %global rolename21 podman
-%deftag 21 1.1.0
+%deftag 21 1.1.1

-#%%defcommit 22 8e536917c4202f847ec8bf53c759b78304019a2f
 %global rolename22 ad_integration
-%deftag 22 1.0.0
+%deftag 22 1.0.1
+
+#%%global rolename23 rhc
+#%%deftag 23 1.0.0

-%global mainid e3ac549bee05349d7ae033971448f861415ad608
-Source: %{url}/auto-maintenance/archive/%{mainid}/auto-maintenance-%{mainid}.tar.gz
 Source1: %{archiveurl1}
 Source2: %{archiveurl2}
 Source3: %{archiveurl3}
@ -219,30 +204,15 @@ Source19: %{archiveurl19}
 Source20: %{archiveurl20}
 Source21: %{archiveurl21}
 Source22: %{archiveurl22}
+#Source23: %{archiveurl23}
+# END AUTOGENERATED SOURCES

-# Not conditionalizing sources per FPC:
-# https://docs.fedoraproject.org/en-US/packaging-guidelines/SourceURL/#_do_not_conditionalize_sources
-# Collections to vendor on RHEL only, Fedora has these available from RPMs
-Source801: https://galaxy.ansible.com/download/ansible-posix-1.4.0.tar.gz
-Source901: https://galaxy.ansible.com/download/community-general-6.2.0.tar.gz
-Source902: https://galaxy.ansible.com/download/containers-podman-1.10.1.tar.gz
-%if 0%{?rhel}
-Provides: bundled(ansible-collection(ansible.posix)) = 1.4.0
-Provides: bundled(ansible-collection(community.general)) = 6.2.0
-Provides: bundled(ansible-collection(containers.podman)) = 1.10.1
-%endif
+# Includes with definitions/tags that differ between RHEL and Fedora
+Source1001: extrasources.inc
+
+%include %{SOURCE1001}

-# RHEL only, changelog is auto generated on Fedora
 Source995: CHANGELOG.md
-Source996: CHANGELOG.rst
-
-# Fedora only, script to convert spec %%changelog into collection CHANGELOG.md
-Source997: spec-to-changelog-md.sh
-
-# RHEL only, script to convert the collection README from Galaxy to Automation Hub
-Source998: collection_readme.sh
-
-Patch51: network-disable-bondtests.diff

 BuildArch: noarch

@ -300,7 +270,9 @@ for i,v in ipairs(roles) do
 end

 %prep
+# BEGIN AUTOGENERATED SETUP
 %setup -q -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a11 -a12 -a13 -a14 -a15 -a16 -a17 -a18 -a19 -a20 -a21 -a22 -n %{getarchivedir 0}
+# END AUTOGENERATED SETUP

 %if 0%{?rhel}
 # Untar vendored collection tarballs to corresponding directories
@ -332,16 +304,14 @@ for rolename in %{rolenames}; do
    mv "$dir_from_archive" ${rolename}
 done

+%if 0%{?rhel}
 cd %{rolename2}/tests
 # this test causes avcs we want to ignore
 sed -r -i -e '/hosts: all/a\
  tags:\
    - tests::avc' tests_selinux_disabled.yml
 cd ../..
-
-cd %{rolename5}
-%patch51 -p1
-cd ..
+%endif

 cd %{rolename15}
 find -P tests examples -name \*.yml | while read file; do
@ -552,15 +522,17 @@ for role in %{rolenames}; do
    .collections/ansible_collections/%{collection_namespace}/%{collection_name}/roles/$role/README.md
 done

-%if 0%{?rhel}
+# Remove test only collection dependencies
+# NOTE: These should not be in meta/collection-requirements.yml, they should be
+# in tests/collection-requirements.yml, but they can't be moved yet
+sed -i -e '/community[.]mysql:/d' -e '/community[.]postgresql:/d' \
+  .collections/ansible_collections/%{collection_namespace}/%{collection_name}/galaxy.yml
+
 cp %{SOURCE995} \
    .collections/ansible_collections/%{collection_namespace}/%{collection_name}/docs/CHANGELOG.md
+%if 0%{?rhel}
 cp %{SOURCE996} \
    .collections/ansible_collections/%{collection_namespace}/%{collection_name}/CHANGELOG.rst
-%else
-# Build the collection CHANGELOG.md
-%{SOURCE997} %{_specdir}/%{name}.spec \
-    .collections/ansible_collections/%{collection_namespace}/%{collection_name}/docs/CHANGELOG.md
 %endif

 # Build the collection
@ -770,6 +742,12 @@ find %{buildroot}%{ansible_roles_dir} -mindepth 1 -maxdepth 1 | \
 %endif

 %changelog
+* Fri Jan 20 2023 Rich Megginson <rmeggins@redhat.com> - 1.21.0-0.15
+- Resolves:rhbz#2162788 : network - role should support running tests with ANSIBLE_GATHERING=explicit
+- Resolves:rhbz#2149683 : Synchronize automation-related changes from Fedora spec file
+- Fix ansible-test issues in several roles
+- Fix nbde_server tang test failure
+
 * Fri Jan 13 2023 Rich Megginson <rmeggins@redhat.com> - 1.21.0-0.14
 - Resolves:rhbz#2143814 : ha_cluster - Allow quorum device configuration
 - Resolves:rhbz#2153081 : ha_cluster - Allow enabled SBD on disabled cluster