remove 1.6 (EOL), add 1.9, add Ubuntu Noble

.github/workflows/main.yml

@@ -23,9 +23,9 @@ jobs:
           - "2.13"
           - "2.14"
         scenario:
-          - dnsdist-16
           - dnsdist-17
           - dnsdist-18
+          - dnsdist-19
           - dnsdist-master
     steps:
       - name: checkout

meta/main.yml

@@ -22,6 +22,7 @@ galaxy_info:
       versions:
         - focal
         - jammy
+        - noble
   galaxy_tags:
     - dnsdist
     - dns

molecule/dnsdist-16/converge.yml → molecule/dnsdist-19/converge.yml

@@ -3,6 +3,6 @@
 - hosts: all
   vars_files:
     - ../resources/vars/dnsdist-common.yml
-    - ../resources/vars/dnsdist-repo-16.yml
+    - ../resources/vars/dnsdist-repo-19.yml
   roles:
     - { role: powerdns.dnsdist }

molecule/dnsdist-16/molecule.yml → molecule/dnsdist-19/molecule.yml

@@ -1,7 +1,7 @@
 ---
 
 scenario:
-  name: dnsdist-16
+  name: dnsdist-19
 
 driver:
   name: docker
@@ -18,10 +18,22 @@ platforms:
     image: oraclelinux:8
     dockerfile_tpl: centos-systemd
 
+  - name: oraclelinux-9
+    image: oraclelinux:9
+    dockerfile_tpl: centos-systemd
+
   - name: ubuntu-2004
     image: ubuntu:20.04
     dockerfile_tpl: ubuntu-systemd
 
+  - name: ubuntu-2204
+    image: ubuntu:22.04
+    dockerfile_tpl: ubuntu-systemd
+
+  - name: ubuntu-2404
+    image: ubuntu:24.04
+    dockerfile_tpl: ubuntu-systemd
+
   - name: debian-10
     image: debian:10
     dockerfile_tpl: debian-systemd
@@ -30,6 +42,10 @@ platforms:
     image: debian:11
     dockerfile_tpl: debian-python3
 
+  - name: debian-12
+    image: debian:12
+    dockerfile_tpl: debian-python3
+
   - name: rockylinux-8
     image: rockylinux:8
     dockerfile_tpl: centos-systemd
@@ -38,6 +54,14 @@ platforms:
     image: almalinux:8
     dockerfile_tpl: centos-systemd
 
+  - name: rockylinux-9
+    image: rockylinux:9.0
+    dockerfile_tpl: centos-systemd
+
+  - name: almalinux-9
+    image: almalinux:9
+    dockerfile_tpl: centos-systemd
+
 provisioner:
   name: ansible
   options:
@@ -51,7 +75,7 @@ provisioner:
     destroy: ../resources/destroy.yml
     prepare: ../resources/prepare.yml
 
-lint: yamllint vars tasks defaults meta
+# lint: yamllint vars tasks defaults meta
 
 verifier:
   name: testinfra
@@ -60,4 +84,4 @@ verifier:
   directory: ../resources/tests/all
   additional_files_or_dirs:
     # path relative to 'directory'
-    - ../repo-16/
+    - ../repo-19/

molecule/dnsdist-master/molecule.yml

@@ -30,6 +30,10 @@ platforms:
     image: ubuntu:22.04
     dockerfile_tpl: ubuntu-systemd
 
+  - name: ubuntu-2404
+    image: ubuntu:24.04
+    dockerfile_tpl: ubuntu-systemd
+
   - name: debian-10
     image: debian:10
     dockerfile_tpl: debian-systemd

molecule/resources/tests/repo-16/test_repo_16.py → molecule/resources/tests/repo-19/test_repo_19.py

@@ -6,9 +6,9 @@
 def test_repo_file(host):
     f = None
     if host.system_info.distribution.lower() in debian_os:
-        f = host.file('/etc/apt/sources.list.d/powerdns-dnsdist-16.list')
+        f = host.file('/etc/apt/sources.list.d/powerdns-dnsdist-19.list')
     if host.system_info.distribution.lower() in rhel_os:
-        f = host.file('/etc/yum.repos.d/powerdns-dnsdist-16.repo')
+        f = host.file('/etc/yum.repos.d/powerdns-dnsdist-19.repo')
 
     assert f.exists
     assert f.user == 'root'
@@ -18,15 +18,15 @@ def test_repo_file(host):
 def test_pdns_repo(host):
     f = None
     if host.system_info.distribution.lower() in debian_os:
-        f = host.file('/etc/apt/sources.list.d/powerdns-dnsdist-16.list')
+        f = host.file('/etc/apt/sources.list.d/powerdns-dnsdist-19.list')
     if host.system_info.distribution.lower() in rhel_os:
-        f = host.file('/etc/yum.repos.d/powerdns-dnsdist-16.repo')
+        f = host.file('/etc/yum.repos.d/powerdns-dnsdist-19.repo')
 
     assert f.exists
-    assert f.contains('dnsdist-16')
+    assert f.contains('dnsdist-19')
 
 
 def test_pdns_version(host):
     cmd = host.run('/usr/bin/dnsdist --version')
 
-    assert 'dnsdist 1.6' in cmd.stdout
+    assert 'dnsdist 1.9' in cmd.stdout

molecule/resources/vars/dnsdist-repo-19.yml

@@ -0,0 +1,7 @@
+---
+
+##
+# Dnsdist 1.9.x Repository
+##
+
+dnsdist_install_repo: "{{ dnsdist_powerdns_repo_19 }}"

vars/main.yml

@@ -8,15 +8,6 @@ dnsdist_powerdns_repo_master:
   yum_debug_symbols_repo_baseurl: http://repo.powerdns.com/centos/$basearch/$releasever/dnsdist-master/debug
   name: powerdns-dnsdist-master
 
-dnsdist_powerdns_repo_16:
-  apt_repo_origin: repo.powerdns.com
-  apt_repo: deb [arch=amd64] http://repo.powerdns.com/{{ ansible_distribution | lower }} {{ ansible_distribution_release | lower }}-dnsdist-16 main
-  gpg_key: http://repo.powerdns.com/FD380FBB-pub.asc
-  gpg_key_id: 9FAAA5577E8FCF62093D036C1B0C6205FD380FBB
-  yum_repo_baseurl: http://repo.powerdns.com/centos/$basearch/$releasever/dnsdist-16
-  yum_debug_symbols_repo_baseurl: http://repo.powerdns.com/centos/$basearch/$releasever/dnsdist-16/debug
-  name: powerdns-dnsdist-16
-
 dnsdist_powerdns_repo_17:
   apt_repo_origin: repo.powerdns.com
   apt_repo: deb [arch=amd64] http://repo.powerdns.com/{{ ansible_distribution | lower }} {{ ansible_distribution_release | lower }}-dnsdist-17 main
@@ -34,3 +25,13 @@ dnsdist_powerdns_repo_18:
   yum_repo_baseurl: http://repo.powerdns.com/centos/$basearch/$releasever/dnsdist-18
   yum_debug_symbols_repo_baseurl: http://repo.powerdns.com/centos/$basearch/$releasever/dnsdist-18/debug
   name: powerdns-dnsdist-18
+
+dnsdist_powerdns_repo_19:
+  apt_repo_origin: repo.powerdns.com
+  apt_repo: deb [arch=amd64] http://repo.powerdns.com/{{ ansible_distribution | lower }} {{ ansible_distribution_release | lower }}-dnsdist-19 main
+  gpg_key: http://repo.powerdns.com/FD380FBB-pub.asc
+  gpg_key_id: 9FAAA5577E8FCF62093D036C1B0C6205FD380FBB
+  yum_repo_baseurl: http://repo.powerdns.com/centos/$basearch/$releasever/dnsdist-19
+  yum_debug_symbols_repo_baseurl: http://repo.powerdns.com/centos/$basearch/$releasever/dnsdist-19/debug
+  name: powerdns-dnsdist-19
+