Fix v6 setup and start using a more modern auth on circleci

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 02560ea72a56042efe1b24897575f52aa4f3b941..8ab11a3db9655cd87e9618dd816761637a069739 100644 (file)
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -301,7 +301,7 @@ commands:
     parameters:
       version:
         type: string
-        default: "42"
+        default: "45"
       distro:
         type: string
         default: "debian"

diff --git a/regression-tests.recursor-dnssec/recursortests.py b/regression-tests.recursor-dnssec/recursortests.py
index 8cbdba1d260a43d7b952a22c63c263c466b6ef9a..f2602a23cd52b121cd947a43cc55a4c2905d62dd 100644 (file)
--- a/regression-tests.recursor-dnssec/recursortests.py
+++ b/regression-tests.recursor-dnssec/recursortests.py
@@ -526,11 +526,11 @@ distributor-threads={threads}""".format(confdir=confdir,
         print("Launching pdns_server..")
         authcmd = list(cls._auth_cmd)
         authcmd.append('--config-dir=%s' % confdir)
-        authcmd.append('--local-address=%s' % ipaddress)
-        if (confdir[-4:] == "ROOT") and have_ipv6():
-            authcmd.append('--local-ipv6=::1')
-        else:
-            authcmd.append('--local-ipv6=')
+        ipconfig = ipaddress
+        # auth-8 is the auth serving the root, it gets an ipv6 address
+        if (confdir[-6:] == "auth-8") and have_ipv6():
+            ipconfig += ',::1'
+        authcmd.append('--local-address=%s' % ipconfig)
         print(' '.join(authcmd))
 
         logFile = os.path.join(confdir, 'pdns.log')