Merge pull request PowerDNS#11399 from omoerbeek/backport-11044-to-re…

…c-4.5.x

rec: Backport 11044 to rec 4.5.x: Fix v6 test setup and start using a more modern auth on circleci

.circleci/config.yml

@@ -305,7 +305,7 @@ commands:
     parameters:
       version:
         type: string
-        default: "42"
+        default: "45"
       distro:
         type: string
         default: "debian"

regression-tests.recursor-dnssec/recursortests.py

@@ -526,11 +526,11 @@ def startAuth(cls, confdir, ipaddress):
         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')

regression-tests.recursor/config.sh

@@ -132,7 +132,7 @@ cat > $PREFIX.12/arthur.example.net.zone <<EOF
 arthur.example.net.      3600 IN SOA $SOA
 arthur.example.net.      3600 IN NS  ns.arthur.example.net.
 arthur.example.net.      3600 IN NS  ns2.arthur.example.net.
-arthur.example.net.      3600 IN MX  mail.arthur.example.net.
+arthur.example.net.      3600 IN MX  10 mail.arthur.example.net.
 ns.arthur.example.net.   3600 IN A   $PREFIX.12
 ns2.arthur.example.net.  3600 IN A   $PREFIX.13
 www.arthur.example.net.  3600 IN A   192.0.2.2
@@ -513,8 +513,6 @@ module-dir=../../../regression-tests/modules
 launch=bind
 daemon=no
 local-address=$dir
-## TODO remove when switching circle-ci and travis to 4.3
-local-ipv6=
 bind-config=named.conf
 no-shuffle
 socket-dir=.