Patches attached.
From 87f8712e3ef6e4a601889625c1649e9fcbb7db75 Mon Sep 17 00:00:00 2001
From: Martin Basti <mba...@redhat.com>
Date: Tue, 5 Jan 2016 19:41:14 +0100
Subject: [PATCH] DNSSEC test: fix adding zones with --skip-overlap-check
In DNSSEC tests the root zone has to be created, this requires to use
--skip-overlap-check to work properly.
---
ipatests/test_integration/test_dnssec.py | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)
diff --git a/ipatests/test_integration/test_dnssec.py b/ipatests/test_integration/test_dnssec.py
index a4387d353d0a72c107978bb292561dde312a9721..65b1bdaf0e5dd4991b5f4dc1e8173f0fc8ad0537 100644
--- a/ipatests/test_integration/test_dnssec.py
+++ b/ipatests/test_integration/test_dnssec.py
@@ -100,6 +100,7 @@ class TestInstallDNSSECLast(IntegrationTest):
args = [
"ipa",
"dnszone-add", test_zone,
+ "--skip-overlap-check",
"--dnssec", "true",
]
self.master.run_command(args)
@@ -119,6 +120,7 @@ class TestInstallDNSSECLast(IntegrationTest):
args = [
"ipa",
"dnszone-add", test_zone_repl,
+ "--skip-overlap-check",
"--dnssec", "true",
]
self.replicas[0].run_command(args)
@@ -268,7 +270,8 @@ class TestInstallDNSSECFirst(IntegrationTest):
def test_sign_root_zone(self):
args = [
- "ipa", "dnszone-add", root_zone, "--dnssec", "true"
+ "ipa", "dnszone-add", root_zone, "--dnssec", "true",
+ "--skip-overlap-check",
]
self.master.run_command(args)
@@ -297,7 +300,8 @@ class TestInstallDNSSECFirst(IntegrationTest):
# add test zone
args = [
- "ipa", "dnszone-add", example_test_zone, "--dnssec", "true"
+ "ipa", "dnszone-add", example_test_zone, "--dnssec", "true",
+ "--skip-overlap-check",
]
self.master.run_command(args)
@@ -433,7 +437,8 @@ class TestMigrateDNSSECMaster(IntegrationTest):
# add test zone
args = [
- "ipa", "dnszone-add", example_test_zone, "--dnssec", "true"
+ "ipa", "dnszone-add", example_test_zone, "--dnssec", "true",
+ "--skip-overlap-check",
]
self.master.run_command(args)
@@ -490,7 +495,8 @@ class TestMigrateDNSSECMaster(IntegrationTest):
# add test zone
args = [
- "ipa", "dnszone-add", example2_test_zone, "--dnssec", "true"
+ "ipa", "dnszone-add", example2_test_zone, "--dnssec", "true",
+ "--skip-overlap-check",
]
self.replicas[0].run_command(args)
@@ -522,7 +528,8 @@ class TestMigrateDNSSECMaster(IntegrationTest):
# add new zone to new replica
args = [
- "ipa", "dnszone-add", example3_test_zone, "--dnssec", "true"
+ "ipa", "dnszone-add", example3_test_zone, "--dnssec", "true",
+ "--skip-overlap-check",
]
self.replicas[1].run_command(args)
--
2.5.0
From aeeb791e087451df411318bc5029b8e11d4c8e41 Mon Sep 17 00:00:00 2001
From: Martin Basti <mba...@redhat.com>
Date: Wed, 6 Jan 2016 15:05:12 +0100
Subject: [PATCH] DNSSEC CI: add missing ldns-utils dependency
---
freeipa.spec.in | 2 ++
1 file changed, 2 insertions(+)
diff --git a/freeipa.spec.in b/freeipa.spec.in
index 34fd2d51a065f90a05e5fb642eb383d53b8d1e2a..2e284e6c8923470671d07d2f2cd5de50847733bb 100644
--- a/freeipa.spec.in
+++ b/freeipa.spec.in
@@ -568,6 +568,7 @@ Requires: python-coverage
Requires: python-polib
Requires: python-pytest-multihost >= 0.5
Requires: python-pytest-sourceorder
+Requires: ldns-utils
Provides: %{alt_name}-tests%{?_isa} = %{version}
Conflicts: %{alt_name}-tests
@@ -598,6 +599,7 @@ Requires: python3-coverage
Requires: python3-polib
Requires: python3-pytest-multihost >= 0.5
Requires: python3-pytest-sourceorder
+Requires: ldns-utils
%description -n python3-ipatests
IPA is an integrated solution to provide centrally managed Identity (users,
--
2.5.0
--
Manage your subscription for the Freeipa-devel mailing list:
https://www.redhat.com/mailman/listinfo/freeipa-devel
Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
