Merge pull request #351 from ficap/reconc-base-domain-fix

Add unique prefix for base_domain also in reconciliation tests to prevent dns collisions
Kuadrant · Feb 26, 2024 · 7010db0 · 7010db0
2 parents c17bb62 + 2e6657a
commit 7010db0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/testsuite/tests/mgc/reconciliation/test_invalid_issuer_reference.py b/testsuite/tests/mgc/reconciliation/test_invalid_issuer_reference.py
@@ -5,6 +5,7 @@
 
 from testsuite.gateway import CustomReference
 from testsuite.policy.tls_policy import TLSPolicy
+from testsuite.utils import generate_tail
 
 pytestmark = [pytest.mark.mgc]
 
@@ -13,7 +14,7 @@
 def base_domain(hub_openshift):
     """Returns preconfigured base domain"""
     zone = selector("managedzone/aws-mz", static_context=hub_openshift.context).object()
-    return zone.model["spec"]["domainName"]
+    return f"{generate_tail()}.{zone.model['spec']['domainName']}"
 
 
 def test_wrong_issuer_type(request, hub_gateway, hub_openshift, blame, module_label):

diff --git a/testsuite/tests/mgc/reconciliation/test_same_target.py b/testsuite/tests/mgc/reconciliation/test_same_target.py
@@ -5,6 +5,7 @@
 
 from testsuite.policy.tls_policy import TLSPolicy
 from testsuite.tests.mgc.reconciliation import dns_policy
+from testsuite.utils import generate_tail
 
 pytestmark = [pytest.mark.mgc]
 
@@ -13,7 +14,7 @@
 def base_domain(hub_openshift):
     """Returns preconfigured base domain"""
     zone = selector("managedzone/aws-mz", static_context=hub_openshift.context).object()
-    return zone.model["spec"]["domainName"]
+    return f"{generate_tail()}.{zone.model['spec']['domainName']}"
 
 
 @pytest.mark.parametrize(