From: Erik Winkels <erik.winkels@powerdns.com>
Date: Mon, 10 Jun 2024 12:20:17 +0000 (+0200)
Subject: Remove support for EOL versions from repo test script.
X-Git-Tag: rec-5.2.0-alpha0~25^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f6c348e9bd8469b62a2963bf6ef015d068149252;p=thirdparty%2Fpdns.git

Remove support for EOL versions from repo test script.

Add `rec-51` support to repo test script.
---

diff --git a/build-scripts/docker/repo-test/generate-repo-files.py b/build-scripts/docker/repo-test/generate-repo-files.py
index 264b85d82e..df3d487984 100755
--- a/build-scripts/docker/repo-test/generate-repo-files.py
+++ b/build-scripts/docker/repo-test/generate-repo-files.py
@@ -8,7 +8,7 @@
 # - `source venv/bin/activate`
 # - `pip install --upgrade pip`
 # - `pip install -r requirements.txt`
-# - `./generate-repo-files.py auth-41`
+# - `./generate-repo-files.py --test rec-51`
 
 # Modules
 
@@ -44,15 +44,14 @@ def init_argparser():
                                                  'test PowerDNS repositories.')
     parser.add_argument('release', metavar='RELEASE',
                         choices=[# Authoritative Server
-                                 'auth-44', 'auth-45', 'auth-46', 'auth-47',
-                                 'auth-48', 'auth-49', 'auth-master',
+                                 'auth-47', 'auth-48', 'auth-49',
+                                 'auth-master',
                                  # Recursor
-                                 'rec-46', 'rec-47', 'rec-48', 'rec-49', 'rec-50',
+                                 'rec-48', 'rec-49', 'rec-50', 'rec-51',
                                  'rec-master',
                                  # DNSDist
-                                 'dnsdist-15', 'dnsdist-16', 'dnsdist-17',
-                                 'dnsdist-18', 'dnsdist-19', 'dnsdist-master'
-                                 ],
+                                 'dnsdist-17', 'dnsdist-18', 'dnsdist-19',
+                                 'dnsdist-master'],
                         help='the release to generate Docker files for: ' +
                              '%(choices)s')
     parser.add_argument('--run-output', action='store_true',
@@ -141,50 +140,30 @@ def write_release_files (release):
     if g_verbose:
         print("Writing release files...")
 
-    if release in ['auth-44', 'auth-45', 'auth-46', 'auth-47', 'auth-48',
-                   'auth-49', 'auth-master',
-                   'rec-46', 'rec-47', 'rec-48', 'rec-49', 'rec-50',
-                   'rec-master',
-                   'dnsdist-15', 'dnsdist-16', 'dnsdist-17', 'dnsdist-18',
-                   'dnsdist-19', 'dnsdist-master']:
+    if release in ['auth-47', 'auth-48', 'auth-49', 'auth-master',
+                   'rec-48', 'rec-49', 'rec-50', 'rec-51', 'rec-master',
+                   'dnsdist-17', 'dnsdist-18', 'dnsdist-19', 'dnsdist-master']:
         write_pkg_pin_file(release)
         write_dockerfile('centos', '7', release)
         write_dockerfile('el', '8', release)
+        write_dockerfile('el', '9', release)
         write_dockerfile('debian', 'buster', release)
         write_list_file('debian', 'buster', release)
-        write_dockerfile('ubuntu', 'focal', release)
-        write_list_file('ubuntu', 'focal', release)
-
-    if release in ['dnsdist-15']:
-        write_dockerfile('raspbian', 'buster', release)
-        write_list_file('raspbian', 'buster', release)
-
-    if release in ['auth-46', 'auth-47', 'auth-48', 'auth-49', 'auth-master',
-                   'rec-46', 'rec-47', 'rec-48', 'rec-49', 'rec-50', 'rec-master',
-                   'dnsdist-16', 'dnsdist-17', 'dnsdist-18', 'dnsdist-19',
-                   'dnsdist-master']:
         write_dockerfile('debian', 'bullseye', release)
         write_list_file('debian', 'bullseye', release)
-
-    if release in ['auth-46', 'auth-47', 'auth-48', 'auth-49', 'auth-master',
-                   'rec-46', 'rec-47', 'rec-48', 'rec-49', 'rec-50', 'rec-master',
-                   'dnsdist-17', 'dnsdist-18', 'dnsdist-19', 'dnsdist-master']:
+        write_dockerfile('ubuntu', 'focal', release)
+        write_list_file('ubuntu', 'focal', release)
         write_dockerfile('ubuntu', 'jammy', release)
         write_list_file('ubuntu', 'jammy', release)
 
-    if release in ['auth-47', 'auth-48', 'auth-49', 'auth-master',
-                   'rec-47', 'rec-48', 'rec-49', 'rec-50', 'rec-master',
-                   'dnsdist-17', 'dnsdist-18', 'dnsdist-19', 'dnsdist-master']:
-        write_dockerfile('el', '9', release)
-
     if release in ['auth-48', 'auth-49', 'auth-master',
-                   'rec-48', 'rec-49', 'rec-50', 'rec-master',
+                   'rec-48', 'rec-49', 'rec-50', 'rec-51', 'rec-master',
                    'dnsdist-19', 'dnsdist-master']:
         write_dockerfile('debian', 'bookworm', release)
         write_list_file('debian', 'bookworm', release)
 
     if release in ['auth-49', 'auth-master',
-                   'rec-50', 'rec-master',
+                   'rec-50', 'rec-51', 'rec-master',
                    'dnsdist-19', 'dnsdist-master']:
         write_dockerfile('ubuntu', 'noble', release)
         write_list_file('ubuntu', 'noble', release)