Remove obsoleted checkds test name servers

These resolver based parental-agents have been replaced by ns3.

diff --git a/bin/tests/system/checkds/ns1/setup.sh b/bin/tests/system/checkds/ns1/setup.sh
index 218ef6313da495e65de22d18d19d5b2a6e48d1e5..26bc14c36c3379dc1d7bc469b7e3cf92a38ee4ca 100644 (file)
--- a/bin/tests/system/checkds/ns1/setup.sh
+++ b/bin/tests/system/checkds/ns1/setup.sh
@@ -24,22 +24,11 @@ echo_i "ns1/setup.sh"
 
 ksk=$("$KEYGEN" -q -fk -a "$DEFAULT_ALGORITHM" -b "$DEFAULT_BITS" -n zone "$zone")
 zsk=$("$KEYGEN" -q -a "$DEFAULT_ALGORITHM" -b "$DEFAULT_BITS" -n zone "$zone")
-cp "$ksk.key" "../ns10/"
-cp "$zsk.key" "../ns10/"
-cp "$ksk.private" "../ns10/"
-cp "$zsk.private" "../ns10/"
 
 cat "$infile" "$ksk.key" "$zsk.key" > "$zonefile"
 "$SIGNER" -g -o "$zone" "$zonefile" > /dev/null 2>&1
 
-(
-       cd ../ns10
-       cat "$infile" "$ksk.key" "$zsk.key" > "$zonefile"
-       "$SIGNER" -g -o "$zone" "$zonefile" > /dev/null 2>&1
-)
-
 # Configure the resolving server with a static key.
 keyfile_to_static_ds "$ksk" > trusted.conf
 cp trusted.conf ../ns3/trusted.conf
-cp trusted.conf ../ns8/trusted.conf
 cp trusted.conf ../ns9/trusted.conf

diff --git a/bin/tests/system/checkds/ns10/named.conf.in b/bin/tests/system/checkds/ns10/named.conf.in
deleted file mode 100644 (file)
index e7e5f0c..0000000
--- a/bin/tests/system/checkds/ns10/named.conf.in
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- *
- * SPDX-License-Identifier: MPL-2.0
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0.  If a copy of the MPL was not distributed with this
- * file, you can obtain one at https://mozilla.org/MPL/2.0/.
- *
- * See the COPYRIGHT file distributed with this work for additional
- * information regarding copyright ownership.
- */
-
-// NS10
-
-options {
-       query-source address 10.53.0.10;
-       notify-source 10.53.0.10;
-       transfer-source 10.53.0.10;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.10; };
-       listen-on-v6 { none; };
-       recursion no;
-       notify yes;
-       dnssec-validation no;
-};
-
-zone "." {
-       type primary;
-       file "root.db.signed";
-};

diff --git a/bin/tests/system/checkds/ns10/root.db.in b/bin/tests/system/checkds/ns10/root.db.in
deleted file mode 100644 (file)
index 988d7d1..0000000
--- a/bin/tests/system/checkds/ns10/root.db.in
+++ /dev/null
@@ -1,24 +0,0 @@
-; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-;
-; SPDX-License-Identifier: MPL-2.0
-;
-; This Source Code Form is subject to the terms of the Mozilla Public
-; License, v. 2.0.  If a copy of the MPL was not distributed with this
-; file, you can obtain one at https://mozilla.org/MPL/2.0/.
-;
-; See the COPYRIGHT file distributed with this work for additional
-; information regarding copyright ownership.
-
-$TTL 300
-.                      IN SOA  gson.nominum.com. a.root.servers.nil. (
-                               2000042100      ; serial
-                               600             ; refresh
-                               600             ; retry
-                               1200            ; expire
-                               600             ; minimum
-                               )
-.                      NS      a.root-servers.nil.
-a.root-servers.nil.    A       10.53.0.10
-
-checkds.               NS      ns5.checkds.
-ns5.checkds.           A       10.53.0.5

diff --git a/bin/tests/system/checkds/ns8/named.conf.in b/bin/tests/system/checkds/ns8/named.conf.in
deleted file mode 100644 (file)
index 5fc52aa..0000000
--- a/bin/tests/system/checkds/ns8/named.conf.in
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- *
- * SPDX-License-Identifier: MPL-2.0
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0.  If a copy of the MPL was not distributed with this
- * file, you can obtain one at https://mozilla.org/MPL/2.0/.
- *
- * See the COPYRIGHT file distributed with this work for additional
- * information regarding copyright ownership.
- */
-
-// NS8
-
-options {
-       query-source address 10.53.0.8;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.8; };
-       listen-on-v6 { none; };
-       recursion yes;
-       dnssec-validation yes;
-       session-keyfile "session.key";
-};
-
-key rndc_key {
-       secret "1234abcd8765";
-       algorithm @DEFAULT_HMAC@;
-};
-
-controls {
-       inet 10.53.0.8 port @CONTROLPORT@ allow { any; } keys { rndc_key; };
-};
-
-zone "." {
-       type hint;
-       file "root.hint";
-};
-
-include "trusted.conf";

diff --git a/bin/tests/system/checkds/ns8/root.hint b/bin/tests/system/checkds/ns8/root.hint
deleted file mode 100644 (file)
index 3d54373..0000000
--- a/bin/tests/system/checkds/ns8/root.hint
+++ /dev/null
@@ -1,14 +0,0 @@
-; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-;
-; SPDX-License-Identifier: MPL-2.0
-;
-; This Source Code Form is subject to the terms of the Mozilla Public
-; License, v. 2.0.  If a copy of the MPL was not distributed with this
-; file, you can obtain one at https://mozilla.org/MPL/2.0/.
-;
-; See the COPYRIGHT file distributed with this work for additional
-; information regarding copyright ownership.
-
-$TTL 999999
-.                       IN NS  a.root-servers.nil.
-a.root-servers.nil.     IN A   10.53.0.10

diff --git a/bin/tests/system/checkds/setup.sh b/bin/tests/system/checkds/setup.sh
index 828b2e6ace1fe73292e96b28b5d42400f81f0d34..2bfc2ca26d52f364965a4572d6d01c476ecff6b6 100644 (file)
--- a/bin/tests/system/checkds/setup.sh
+++ b/bin/tests/system/checkds/setup.sh
@@ -25,9 +25,7 @@ copy_setports ns4/named.conf.in ns4/named.conf
 copy_setports ns5/named.conf.in ns5/named.conf
 copy_setports ns6/named.conf.in ns6/named.conf
 copy_setports ns7/named.conf.in ns7/named.conf
-copy_setports ns8/named.conf.in ns8/named.conf
 copy_setports ns9/named.conf.in ns9/named.conf
-copy_setports ns10/named.conf.in ns10/named.conf
 
 # Setup zones
 (