From: Evan Hunt <each@isc.org>
Date: Fri, 7 Aug 2026 05:52:29 +0000 (-0700)
Subject: fold in rollover-zsk-prepub
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f4092fa9b316c39d1d648fba46bfec84cee914c2;p=thirdparty%2Fbind9.git

fold in rollover-zsk-prepub
---

diff --git a/bin/tests/system/rollover_zsk_prepub/ns3/named.conf.j2 b/bin/tests/system/rollover/ns3/named-zsk-prepub.conf.j2
similarity index 96%
rename from bin/tests/system/rollover_zsk_prepub/ns3/named.conf.j2
rename to bin/tests/system/rollover/ns3/named-zsk-prepub.conf.j2
index 01e88223a29..886199e3cba 100644
--- a/bin/tests/system/rollover_zsk_prepub/ns3/named.conf.j2
+++ b/bin/tests/system/rollover/ns3/named-zsk-prepub.conf.j2
@@ -1,6 +1,6 @@
 {% set zones = ["autosign", "manual"] %}
 
-include "kasp.conf";
+include "policy/zsk-prepub.conf";
 include "named.common.conf";
 
 {% for tld in zones %}
diff --git a/bin/tests/system/rollover_zsk_prepub/ns3/kasp.conf b/bin/tests/system/rollover/ns3/policy/zsk-prepub.conf
similarity index 100%
rename from bin/tests/system/rollover_zsk_prepub/ns3/kasp.conf
rename to bin/tests/system/rollover/ns3/policy/zsk-prepub.conf
diff --git a/bin/tests/system/rollover_zsk_prepub/tests_rollover_zsk_prepublication.py b/bin/tests/system/rollover/tests_rollover_zsk_prepublication.py
similarity index 99%
rename from bin/tests/system/rollover_zsk_prepub/tests_rollover_zsk_prepublication.py
rename to bin/tests/system/rollover/tests_rollover_zsk_prepublication.py
index 9e2aec2178e..b12482e6192 100644
--- a/bin/tests/system/rollover_zsk_prepub/tests_rollover_zsk_prepublication.py
+++ b/bin/tests/system/rollover/tests_rollover_zsk_prepublication.py
@@ -58,6 +58,7 @@ def bootstrap():
     data = {
         "tlds": [],
         "trust_anchors": [],
+        "testconf": "zsk-prepub",
     }
 
     tlds = []
diff --git a/bin/tests/system/rollover_zsk_prepub/ns1 b/bin/tests/system/rollover_zsk_prepub/ns1
deleted file mode 120000
index 76608beaedd..00000000000
--- a/bin/tests/system/rollover_zsk_prepub/ns1
+++ /dev/null
@@ -1 +0,0 @@
-../rollover/ns1
\ No newline at end of file
diff --git a/bin/tests/system/rollover_zsk_prepub/ns2 b/bin/tests/system/rollover_zsk_prepub/ns2
deleted file mode 120000
index 41a09bb648b..00000000000
--- a/bin/tests/system/rollover_zsk_prepub/ns2
+++ /dev/null
@@ -1 +0,0 @@
-../rollover/ns2
\ No newline at end of file
diff --git a/bin/tests/system/rollover_zsk_prepub/ns3/named.common.conf.j2 b/bin/tests/system/rollover_zsk_prepub/ns3/named.common.conf.j2
deleted file mode 120000
index 5dc26178cb1..00000000000
--- a/bin/tests/system/rollover_zsk_prepub/ns3/named.common.conf.j2
+++ /dev/null
@@ -1 +0,0 @@
-../../rollover/ns3/named.common.conf.j2
\ No newline at end of file
diff --git a/bin/tests/system/rollover_zsk_prepub/ns3/template.db.j2.manual b/bin/tests/system/rollover_zsk_prepub/ns3/template.db.j2.manual
deleted file mode 120000
index 38619a01b24..00000000000
--- a/bin/tests/system/rollover_zsk_prepub/ns3/template.db.j2.manual
+++ /dev/null
@@ -1 +0,0 @@
-../../rollover/ns3/template.db.j2.manual
\ No newline at end of file
diff --git a/bin/tests/system/rollover_zsk_prepub/ns3/trusted.conf.j2 b/bin/tests/system/rollover_zsk_prepub/ns3/trusted.conf.j2
deleted file mode 120000
index cb0be77b220..00000000000
--- a/bin/tests/system/rollover_zsk_prepub/ns3/trusted.conf.j2
+++ /dev/null
@@ -1 +0,0 @@
-../../_common/trusted.conf.j2
\ No newline at end of file