Add auth-45 and auth-46 to repo test script.

Also remove auth-41, auth-42 and rec-42 from the script.

diff --git a/build-scripts/docker/repo-test/generate-repo-files.py b/build-scripts/docker/repo-test/generate-repo-files.py
index 8c0b6aff65f3d65d328ad950307167f13eafc609..7ce2ce6483be5cdf029457e1525f3e056ce9a0dd 100755 (executable)
--- a/build-scripts/docker/repo-test/generate-repo-files.py
+++ b/build-scripts/docker/repo-test/generate-repo-files.py
@@ -43,10 +43,11 @@ def init_argparser():
                                                  'test PowerDNS repositories.')
     parser.add_argument('release', metavar='RELEASE',
                         choices=[# Authoritative Server
-                                 'auth-42', 'auth-43', 'auth-44', 'auth-master',
+                                 'auth-43', 'auth-44', 'auth-45', 'auth-46',
+                                 'auth-master',
                                  # Recursor
-                                 'rec-42', 'rec-43', 'rec-44', 'rec-45',
-                                 'rec-46', 'rec-master',
+                                 'rec-43', 'rec-44', 'rec-45', 'rec-46',
+                                 'rec-master',
                                  # DNSDist
                                  'dnsdist-15', 'dnsdist-16', 'dnsdist-17',
                                  'dnsdist-master'
@@ -140,34 +141,33 @@ def write_release_files (release):
     if release in ['auth-43', 'auth-master']:
         write_dockerfile('centos', '6', release)
 
-    if release in ['auth-41', 'auth-42', 'auth-43', 'auth-44', 'auth-master',
-                   'rec-42', 'rec-43', 'rec-44', 'rec-45', 'rec-46', 'rec-master',
+    if release in ['auth-43', 'auth-44', 'auth-45', 'auth-46', 'auth-master',
+                   'rec-43', 'rec-44', 'rec-45', 'rec-46', 'rec-master',
                    'dnsdist-15', 'dnsdist-16', 'dnsdist-17', 'dnsdist-master']:
         write_dockerfile('centos', '7', release)
         write_dockerfile('ubuntu', 'bionic', release)
         write_list_file('ubuntu', 'bionic', release)
         write_pkg_pin_file(release)
 
-    if release in ['auth-42', 'auth-43',
-                   'rec-42', 'rec-43',
-                   'dnsdist-15']:
+    if release in ['auth-43', 'rec-43', 'dnsdist-15']:
         write_dockerfile('raspbian', 'buster', release)
         write_list_file('raspbian', 'buster', release)
 
-    if release in ['auth-42', 'auth-43', 'auth-44', 'auth-master',
-                   'rec-42', 'rec-43', 'rec-44', 'rec-45', 'rec-46', 'rec-master',
+    if release in ['auth-43', 'auth-44', 'auth-45', 'auth-46', 'auth-master',
+                   'rec-43', 'rec-44', 'rec-45', 'rec-46', 'rec-master',
                    'dnsdist-15', 'dnsdist-16', 'dnsdist-17', 'dnsdist-master']:
         write_dockerfile('centos', '8', release)
         write_dockerfile('debian', 'buster', release)
         write_list_file('debian', 'buster', release)
 
-    if release in ['auth-43', 'auth-44', 'auth-master',
+    if release in ['auth-43', 'auth-44', 'auth-45', 'auth-46', 'auth-master',
                    'rec-43', 'rec-44', 'rec-45', 'rec-46', 'rec-master',
                    'dnsdist-15', 'dnsdist-16', 'dnsdist-17', 'dnsdist-master']:
         write_dockerfile('ubuntu', 'focal', release)
         write_list_file('ubuntu', 'focal', release)
 
-    if release in ['rec-46', 'rec-master',
+    if release in ['auth-46', 'auth-master',
+                   'rec-46', 'rec-master',
                    'dnsdist-16', 'dnsdist-17', 'dnsdist-master']:
         write_dockerfile('debian', 'bullseye', release)
         write_list_file('debian', 'bullseye', release)