PR#91: remove unneeded network patch; Resolves:rhbz#2141152 - rpms/linux-system-roles

rpms / linux-system-roles

#91 remove unneeded network patch; Resolves:rhbz#2141152

Merged 2 years ago by rmeggins. Opened 2 years ago by rmeggins.

rpms/ rmeggins/linux-system-roles remove-unneeded-patch into rawhide

remove unneeded network patch; Resolves:rhbz#2141152

Rich Megginson • 2 years ago

749dbf9

linux-system-roles.spec

file modified

+9 -6

		`@@ -30,7 +30,7 @@`
		`Url: https://github.com/linux-system-roles`
		`Summary: Set of interfaces for unified system management`
		`Version: 1.22.0`
		`- Release: 2%{?dist}`
		`+ Release: 3%{?dist}`

		`License: GPLv3+ and MIT and BSD and Python`
		`%global _pkglicensedir %{_licensedir}/%{name}`
		`@@ -240,8 +240,6 @@`
		`# RHEL only, script to convert the collection README from Galaxy to Automation Hub`
		`Source998: collection_readme.sh`

		`- Patch51: network-disable-bondtests.diff`
		`-`
		`BuildArch: noarch`

		`%if %{with html}`
		`@@ -320,9 +318,6 @@`
		`- tests::avc' tests_selinux_disabled.yml`
		`cd ../..`

		`- cd %{rolename5}`
		`- %patch51 -p1`
		`- cd ..`
		`cd %{rolename15}`
		`find -P tests examples -name \*.yml \| while read file; do`
		`sed -r -i -e "s/ansible-sshd/linux-system-roles.sshd/" \`
		`@@ -747,6 +742,14 @@`
		`%endif`

		`%changelog`
		`+ * Tue Nov 08 2022 Rich Megginson <rmeggins@redhat.com> - 1.22.0-3`
		`+ - remove unneeded network patch`
		`+`
		`+ * Tue Nov 08 2022 Sergei Petrosian <spetrosi@redhat.com> - 1.22.0-2`
		`+ - fix https://bugzilla.redhat.com/show_bug.cgi?id=2141152`
		`+ Resolves:rhbz#2141152`
		`+ Added pretrans scriptlet to deal with conversion of symlink to directory`
		`+`
		`* Thu Nov 03 2022 Rich Megginson <rmeggins@redhat.com> - 1.22.0-1`
		`- ad_integration - new role`
		`- cockpit - use the firewall, selinux, certificate roles`

network-disable-bondtests.diff

file removed

-65

		`@@ -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`
		`-`

rmeggins commented 2 years ago

remove unneeded network patch
fix https://bugzilla.redhat.com/show_bug.cgi?id=2141152
Resolves:rhbz#2141152
Added pretrans scriptlet to deal with conversion of symlink to directory