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 01e88223a296370f2d6a65165fef0b009ee6cfc2..886199e3cba1ca75ebe1d14137f4539e6e48275a 100644 (file)
--- 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 9e2aec2178efd71a2d37b48855c5024df86bca54..b12482e619285aad7e2f38a83e6677554ef90eed 100644 (file)
--- 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 (symlink)
index 76608be..0000000
--- 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 (symlink)
index 41a09bb..0000000
--- 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 (symlink)
index 5dc2617..0000000
--- 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 (symlink)
index 38619a0..0000000
--- 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 (symlink)
index cb0be77..0000000
--- 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