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

fold in rollover-ksk tests

merge the "rollover_ksk_doubleksk" and "rollover_ksk_3crowd" system
tests into "rollover"
---

diff --git a/bin/tests/system/rollover_ksk_3crowd/ns3/named.conf.j2 b/bin/tests/system/rollover/ns3/named-ksk-3crowd.conf.j2
similarity index 89%
rename from bin/tests/system/rollover_ksk_3crowd/ns3/named.conf.j2
rename to bin/tests/system/rollover/ns3/named-ksk-3crowd.conf.j2
index 86e1941ec13..83bec5e23e2 100644
--- a/bin/tests/system/rollover_ksk_3crowd/ns3/named.conf.j2
+++ b/bin/tests/system/rollover/ns3/named-ksk-3crowd.conf.j2
@@ -1,4 +1,4 @@
-include "kasp.conf";
+include "policy/ksk.conf";
 include "named.common.conf";
 
 zone "three-is-a-crowd.kasp" {
diff --git a/bin/tests/system/rollover_ksk_doubleksk/ns3/named.conf.j2 b/bin/tests/system/rollover/ns3/named-ksk-doubleksk.conf.j2
similarity index 97%
rename from bin/tests/system/rollover_ksk_doubleksk/ns3/named.conf.j2
rename to bin/tests/system/rollover/ns3/named-ksk-doubleksk.conf.j2
index 359e735069f..aad37dad487 100644
--- a/bin/tests/system/rollover_ksk_doubleksk/ns3/named.conf.j2
+++ b/bin/tests/system/rollover/ns3/named-ksk-doubleksk.conf.j2
@@ -1,6 +1,6 @@
 {% set zones = ["autosign", "manual"] %}
 
-include "kasp.conf";
+include "policy/ksk.conf";
 include "named.common.conf";
 
 {% for tld in zones %}
diff --git a/bin/tests/system/rollover_ksk_doubleksk/ns3/kasp.conf b/bin/tests/system/rollover/ns3/policy/ksk.conf
similarity index 100%
rename from bin/tests/system/rollover_ksk_doubleksk/ns3/kasp.conf
rename to bin/tests/system/rollover/ns3/policy/ksk.conf
diff --git a/bin/tests/system/rollover_ksk_doubleksk/tests_rollover_ksk_doubleksk.py b/bin/tests/system/rollover/tests_rollover_ksk_doubleksk.py
similarity index 99%
rename from bin/tests/system/rollover_ksk_doubleksk/tests_rollover_ksk_doubleksk.py
rename to bin/tests/system/rollover/tests_rollover_ksk_doubleksk.py
index 6c7a43e777c..7ae043a9f5c 100644
--- a/bin/tests/system/rollover_ksk_doubleksk/tests_rollover_ksk_doubleksk.py
+++ b/bin/tests/system/rollover/tests_rollover_ksk_doubleksk.py
@@ -51,6 +51,7 @@ def bootstrap():
     data = {
         "tlds": [],
         "trust_anchors": [],
+        "testconf": "ksk-doubleksk",
     }
 
     tlds = []
diff --git a/bin/tests/system/rollover_ksk_3crowd/tests_rollover_three_is_a_crowd.py b/bin/tests/system/rollover/tests_rollover_three_is_a_crowd.py
similarity index 99%
rename from bin/tests/system/rollover_ksk_3crowd/tests_rollover_three_is_a_crowd.py
rename to bin/tests/system/rollover/tests_rollover_three_is_a_crowd.py
index 934343919c9..5a8d5579515 100644
--- a/bin/tests/system/rollover_ksk_3crowd/tests_rollover_three_is_a_crowd.py
+++ b/bin/tests/system/rollover/tests_rollover_three_is_a_crowd.py
@@ -36,6 +36,7 @@ def bootstrap():
     data = {
         "tlds": [],
         "trust_anchors": [],
+        "testconf": "ksk-3crowd",
     }
 
     tlds = []
diff --git a/bin/tests/system/rollover_ksk_3crowd/ns1 b/bin/tests/system/rollover_ksk_3crowd/ns1
deleted file mode 120000
index 76608beaedd..00000000000
--- a/bin/tests/system/rollover_ksk_3crowd/ns1
+++ /dev/null
@@ -1 +0,0 @@
-../rollover/ns1
\ No newline at end of file
diff --git a/bin/tests/system/rollover_ksk_3crowd/ns2 b/bin/tests/system/rollover_ksk_3crowd/ns2
deleted file mode 120000
index 41a09bb648b..00000000000
--- a/bin/tests/system/rollover_ksk_3crowd/ns2
+++ /dev/null
@@ -1 +0,0 @@
-../rollover/ns2
\ No newline at end of file
diff --git a/bin/tests/system/rollover_ksk_3crowd/ns3/kasp.conf b/bin/tests/system/rollover_ksk_3crowd/ns3/kasp.conf
deleted file mode 120000
index 3cdfe3db68a..00000000000
--- a/bin/tests/system/rollover_ksk_3crowd/ns3/kasp.conf
+++ /dev/null
@@ -1 +0,0 @@
-../../rollover_ksk_doubleksk/ns3/kasp.conf
\ No newline at end of file
diff --git a/bin/tests/system/rollover_ksk_3crowd/ns3/named.common.conf.j2 b/bin/tests/system/rollover_ksk_3crowd/ns3/named.common.conf.j2
deleted file mode 120000
index 5dc26178cb1..00000000000
--- a/bin/tests/system/rollover_ksk_3crowd/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_ksk_3crowd/ns3/template.db.j2.manual b/bin/tests/system/rollover_ksk_3crowd/ns3/template.db.j2.manual
deleted file mode 120000
index 38619a01b24..00000000000
--- a/bin/tests/system/rollover_ksk_3crowd/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_ksk_3crowd/ns3/trusted.conf.j2 b/bin/tests/system/rollover_ksk_3crowd/ns3/trusted.conf.j2
deleted file mode 120000
index cb0be77b220..00000000000
--- a/bin/tests/system/rollover_ksk_3crowd/ns3/trusted.conf.j2
+++ /dev/null
@@ -1 +0,0 @@
-../../_common/trusted.conf.j2
\ No newline at end of file
diff --git a/bin/tests/system/rollover_ksk_doubleksk/ns1 b/bin/tests/system/rollover_ksk_doubleksk/ns1
deleted file mode 120000
index 76608beaedd..00000000000
--- a/bin/tests/system/rollover_ksk_doubleksk/ns1
+++ /dev/null
@@ -1 +0,0 @@
-../rollover/ns1
\ No newline at end of file
diff --git a/bin/tests/system/rollover_ksk_doubleksk/ns2 b/bin/tests/system/rollover_ksk_doubleksk/ns2
deleted file mode 120000
index 41a09bb648b..00000000000
--- a/bin/tests/system/rollover_ksk_doubleksk/ns2
+++ /dev/null
@@ -1 +0,0 @@
-../rollover/ns2
\ No newline at end of file
diff --git a/bin/tests/system/rollover_ksk_doubleksk/ns3/named.common.conf.j2 b/bin/tests/system/rollover_ksk_doubleksk/ns3/named.common.conf.j2
deleted file mode 120000
index 5dc26178cb1..00000000000
--- a/bin/tests/system/rollover_ksk_doubleksk/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_ksk_doubleksk/ns3/template.db.j2.manual b/bin/tests/system/rollover_ksk_doubleksk/ns3/template.db.j2.manual
deleted file mode 120000
index 38619a01b24..00000000000
--- a/bin/tests/system/rollover_ksk_doubleksk/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_ksk_doubleksk/ns3/trusted.conf.j2 b/bin/tests/system/rollover_ksk_doubleksk/ns3/trusted.conf.j2
deleted file mode 120000
index cb0be77b220..00000000000
--- a/bin/tests/system/rollover_ksk_doubleksk/ns3/trusted.conf.j2
+++ /dev/null
@@ -1 +0,0 @@
-../../_common/trusted.conf.j2
\ No newline at end of file