From 6c0321873371486ae23ee7e00b36582e106d9ab1 Mon Sep 17 00:00:00 2001 From: Fraser Tweedale Date: Tue, 9 Oct 2018 10:45:08 +1100 Subject: [PATCH] Restore KRA clone installation integration test This Dogtag issue that caused KRA clone installation failure in some scenarios has been fixed (https://pagure.io/dogtagpki/issue/3055). This reverts commit 2488813260a407477c7516b33ce4238b69c8dd8d and bumps the pki-core dependency. Fixes: https://pagure.io/freeipa/issue/7654 --- freeipa.spec.in | 6 +++--- ipatests/test_integration/test_installation.py | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/freeipa.spec.in b/freeipa.spec.in index 4c9633791b..f19f23d3f2 100644 --- a/freeipa.spec.in +++ b/freeipa.spec.in @@ -72,9 +72,9 @@ %endif # Fedora -# Require Dogtag PKI 10.6.6 to detect when fips is available, -# https://pagure.io/freeipa/issue/7608 -%global pki_version 10.6.6 +# Require Dogtag PKI 10.6.7 which fixes UpdateNumberRange clone +# installation issue; https://pagure.io/freeipa/issue/7654 +%global pki_version 10.6.7 # NSS release with fix for CKA_LABEL import bug in shared SQL database. # https://bugzilla.redhat.com/show_bug.cgi?id=1568271 diff --git a/ipatests/test_integration/test_installation.py b/ipatests/test_integration/test_installation.py index a256767d22..dccfd4a97e 100644 --- a/ipatests/test_integration/test_installation.py +++ b/ipatests/test_integration/test_installation.py @@ -123,7 +123,6 @@ def test_replica2_with_dns_install(self): def test_replica2_ipa_ca_install(self): tasks.install_ca(self.replicas[2]) - @pytest.mark.xfail(reason='Ticket 7654', strict=True) def test_replica2_ipa_kra_install(self): tasks.install_kra(self.replicas[2])