From f34496f3cbcfcd1ad45e84761eeb398973a5f0ca Mon Sep 17 00:00:00 2001 From: David Hanina Date: Thu, 16 Apr 2026 10:37:55 +0200 Subject: [PATCH] ipa-4.13.1-3.2 - Related: RHEL-166865 Include latest fixes in python3-ipatests package [rhel-9.8.z] Signed-off-by: David Hanina --- 0044-ipatests-fix-migration-test.patch | 49 ++++++++++++++++++++++++++ freeipa.spec | 6 +++- 2 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 0044-ipatests-fix-migration-test.patch diff --git a/0044-ipatests-fix-migration-test.patch b/0044-ipatests-fix-migration-test.patch new file mode 100644 index 0000000..22f6c0b --- /dev/null +++ b/0044-ipatests-fix-migration-test.patch @@ -0,0 +1,49 @@ +From 3d5fe37d41332cdca486c9ca42089934e5ed7f89 Mon Sep 17 00:00:00 2001 +From: Florence Blanc-Renaud +Date: Mon, 30 Mar 2026 10:39:51 +0200 +Subject: [PATCH] ipatests: fix migration test + +A previous commit modified the DNS zone forwarder's IP address +but forgot to change the expected value in the test. +Use a constant in the test setup and in the test expectation. + +Related: https://pagure.io/freeipa/issue/9964 +Signed-off-by: Florence Blanc-Renaud +Reviewed-By: Sudhir Menon +--- + ipatests/test_integration/test_ipa_ipa_migration.py | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/ipatests/test_integration/test_ipa_ipa_migration.py b/ipatests/test_integration/test_ipa_ipa_migration.py +index 105c79b..436e222 100644 +--- a/ipatests/test_integration/test_ipa_ipa_migration.py ++++ b/ipatests/test_integration/test_ipa_ipa_migration.py +@@ -15,6 +15,7 @@ import pytest + import re + import textwrap + ++TEST_ZONE_FORWARDER = "10.11.12.13" + + def prepare_ipa_server(master): + """ +@@ -227,7 +228,7 @@ def prepare_ipa_server(master): + "dnsforwardzone-add", + "forwardzone.test", + "--forwarder", +- "192.168.124.10", ++ TEST_ZONE_FORWARDER, + ] + ) + +@@ -827,7 +828,7 @@ class TestIPAMigrateCLIOptions(MigrationTest): + ) + assert 'Zone name: {}'.format(zone_name) in result.stdout_text + assert 'Active zone: True' in result.stdout_text +- assert 'Zone forwarders: 10.11.12.13' in result.stdout_text ++ assert f'Zone forwarders: {TEST_ZONE_FORWARDER}' in result.stdout_text + assert 'Forward policy: first' in result.stdout_text + + def test_ipa_migrate_version_option(self): +-- +2.52.0 + diff --git a/freeipa.spec b/freeipa.spec index d0aade7..0291355 100644 --- a/freeipa.spec +++ b/freeipa.spec @@ -229,7 +229,7 @@ Name: %{package_name} Version: %{IPA_VERSION} -Release: 3%{?rc_version:.%rc_version}%{?dist}.1 +Release: 3%{?rc_version:.%rc_version}%{?dist}.2 Summary: The Identity, Policy and Audit system License: GPL-3.0-or-later @@ -290,6 +290,7 @@ Patch0040: 0040-ipatests-Add-selfservice-find-cli-tests-to-xmlrpc-Ad.patch Patch0041: 0041-ipatests-fix-the-method-add_a_record.patch Patch0042: 0042-ipatests-Remove-xfail-for-sssd-issues-7169.patch Patch0043: 0043-Fix-ipa-ca-show-ipa-all-not-listing-RSN-version.patch +Patch0044: 0044-ipatests-fix-migration-test.patch Patch1001: 1001-Change-branding-to-IPA-and-Identity-Management.patch %endif %endif @@ -2002,6 +2003,9 @@ fi %endif %changelog +* Thu Apr 16 2026 David Hanina - 4.13.1-3.2 +- Related: RHEL-166865 Include latest fixes in python3-ipatests package [rhel-9.8.z] + * Mon Apr 13 2026 David Hanina - 4.13.1-3.1 - Resolves: RHEL-166865 Include latest fixes in python3-ipatests package [rhel-9.8.z] - Resolves: RHEL-155037 Pagure #9953: Adding a group with 32Bit Idrange fails. [rhel-9.8.z]