Merge pull request PowerDNS#247 from npmdnl/npmdnl-auth50

Adding pdns50 removing pdns47

Author: npmdnl

.github/workflows/main.yml

@@ -23,9 +23,9 @@ jobs:
           - "2.15"
           - "2.16"
         scenario:
-          - pdns-47
           - pdns-48
           - pdns-49
+          - pdns-50
           - pdns-master
           - pdns-os-repos
           - systemd-no-overrides

CHANGELOG.md

@@ -1,3 +1,11 @@
+## v1.9.0 (UNRELEASED)
+
+NEW FEATURES:
+- Added pdns50
+
+REMOVED / EOL:
+- EOL pdns47
+
 ## v1.8.0 (2023-08-03)
 
 NEW FEATURES:

README.md

@@ -32,11 +32,6 @@ By default, the PowerDNS Authoritative Server is installed from the software rep
     - { role: PowerDNS.pdns,
         pdns_install_repo: "{{ pdns_auth_powerdns_repo_master }}"
 
-# Install the PowerDNS Authoritative Server from the '4.7.x' official repository
-- hosts: all
-  roles:
-    - { role: PowerDNS.pdns,
-        pdns_install_repo: "{{ pdns_auth_powerdns_repo_47 }}"
 
 # Install the PowerDNS Authoritative Server from the '4.8.x' official repository
 - hosts: all
@@ -49,6 +44,12 @@ By default, the PowerDNS Authoritative Server is installed from the software rep
   roles:
     - { role: PowerDNS.pdns,
         pdns_install_repo: "{{ pdns_auth_powerdns_repo_49 }}"
+
+# Install the PowerDNS Authoritative Server from the '5.0.x' official repository
+- hosts: all
+  roles:
+    - { role: PowerDNS.pdns,
+        pdns_install_repo: "{{ pdns_auth_powerdns_repo_50 }}"
 ```
 
 The examples above, show how to install the PowerDNS Authoritative Server from the official PowerDNS repositories

molecule/pdns-47/converge.yml molecule/pdns-50/converge.ymlmolecule/pdns-47/converge.yml renamed to molecule/pdns-50/converge.yml

@@ -1,10 +1,10 @@
 ---
 
-- name: PDNS 4.7
+- name: PDNS 5.0
   hosts: pdns
   vars_files:
     - ../resources/vars/pdns-common.yml
-    - ../resources/vars/pdns-repo-47.yml
+    - ../resources/vars/pdns-repo-50.yml
     - ../resources/vars/pdns-backends.yml
   roles:
     - { role: powerdns.pdns }

molecule/pdns-47/molecule.yml molecule/pdns-50/molecule.ymlmolecule/pdns-47/molecule.yml renamed to molecule/pdns-50/molecule.yml

@@ -1,7 +1,7 @@
 ---
 
 scenario:
-  name: pdns-47
+  name: pdns-50
 
 driver:
   name: docker
@@ -48,6 +48,14 @@ platforms:
       - /tmp
     dockerfile_tpl: debian-systemd
 
+  - name: ubuntu-2404
+    groups: ["pdns"]
+    image: ubuntu:24.04
+    tmpfs:
+      - /run
+      - /tmp
+    dockerfile_tpl: debian-systemd
+
   - name: debian-11
     groups: ["pdns"]
     image: debian:11
@@ -61,6 +69,19 @@ platforms:
     dockerfile_tpl: debian-systemd
     environment: { container: docker }
 
+  - name: debian-12
+    groups: ["pdns"]
+    image: debian:12
+    privileged: True
+    volume_mounts:
+      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
+    tmpfs:
+      - /run
+      - /run/lock
+      - /tmp
+    dockerfile_tpl: debian-systemd
+    environment: { container: docker }
+
   # In order to run the tests we need
   # a MySQL container to be up & running
   - name: mysql
@@ -108,7 +129,7 @@ verifier:
   directory: ../resources/tests/all
   additional_files_or_dirs:
     # path relative to 'directory'
-    - ../repo-47/
+    - ../repo-50/
     - ../backend-sqlite/
     - ../backend-mysql/
     - ../systemd-override/

…/resources/tests/repo-47/test_repo_47.py …resources/tests/repo-50/test_repo_50 .pymolecule/resources/tests/repo-47/test_repo_47.py renamed to molecule/resources/tests/repo-50/test_repo_50 .py molecule/resources/tests/repo-47/test_repo_47.py renamed to molecule/resources/tests/repo-50/test_repo_50 .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-auth-47.list')
+        f = host.file('/etc/apt/sources.list.d/powerdns-auth-50.list')
     if host.system_info.distribution.lower() in rhel_os:
-        f = host.file('/etc/yum.repos.d/powerdns-auth-47.repo')
+        f = host.file('/etc/yum.repos.d/powerdns-auth-50.repo')
 
     assert f.exists
     assert f.user == 'root'
@@ -18,12 +18,12 @@ 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-auth-47.list')
+        f = host.file('/etc/apt/sources.list.d/powerdns-auth-50.list')
     if host.system_info.distribution.lower() in rhel_os:
-        f = host.file('/etc/yum.repos.d/powerdns-auth-47.repo')
+        f = host.file('/etc/yum.repos.d/powerdns-auth-50.repo')
 
     assert f.exists
-    assert f.contains('auth-47')
+    assert f.contains('auth-50')
 
 
 def test_repo_pinning_file(host):
@@ -40,5 +40,5 @@ def test_repo_pinning_file(host):
 def test_pdns_version(host):
     cmd = host.run('/usr/sbin/pdns_server --version')
 
-    assert 'PowerDNS Authoritative Server' in cmd.stderr
-    assert '4.7' in cmd.stderr
+    assert 'PowerDNS Authoritative Server' in cmd.stdout
+    assert '5.0' in cmd.stdout

molecule/resources/vars/pdns-repo-47.yml

@@ -0,0 +1,7 @@
+---
+
+##
+# PowerDNS 5.0.x Repository
+##
+
+pdns_install_repo: "{{ pdns_auth_powerdns_repo_50 }}"

molecule/resources/vars/pdns-repo-50.yml

@@ -9,15 +9,6 @@ pdns_auth_powerdns_repo_master:
   yum_debug_symbols_repo_baseurl: "http://repo.powerdns.com/centos/$basearch/$releasever/auth-master/debug"
   name: "powerdns-auth-master"
 
-pdns_auth_powerdns_repo_47:
-  apt_repo_origin: "repo.powerdns.com"
-  apt_repo: "deb [arch=amd64] http://repo.powerdns.com/{{ ansible_distribution | lower }} {{ ansible_distribution_release | lower }}-auth-47 main"
-  gpg_key: "http://repo.powerdns.com/FD380FBB-pub.asc"
-  gpg_key_id: "9FAAA5577E8FCF62093D036C1B0C6205FD380FBB"
-  yum_repo_baseurl: "http://repo.powerdns.com/centos/$basearch/$releasever/auth-47"
-  yum_debug_symbols_repo_baseurl: "http://repo.powerdns.com/centos/$basearch/$releasever/auth-47/debug"
-  name: "powerdns-auth-47"
-
 pdns_auth_powerdns_repo_48:
   apt_repo_origin: "repo.powerdns.com"
   apt_repo: "deb [arch=amd64] http://repo.powerdns.com/{{ ansible_distribution | lower }} {{ ansible_distribution_release | lower }}-auth-48 main"
@@ -36,6 +27,15 @@ pdns_auth_powerdns_repo_49:
   yum_debug_symbols_repo_baseurl: "http://repo.powerdns.com/centos/$basearch/$releasever/auth-49/debug"
   name: "powerdns-auth-49"
 
+pdns_auth_powerdns_repo_50:
+  apt_repo_origin: "repo.powerdns.com"
+  apt_repo: "deb [arch=amd64] http://repo.powerdns.com/{{ ansible_distribution | lower }} {{ ansible_distribution_release | lower }}-auth-50 main"
+  gpg_key: "http://repo.powerdns.com/FD380FBB-pub.asc"
+  gpg_key_id: "9FAAA5577E8FCF62093D036C1B0C6205FD380FBB"
+  yum_repo_baseurl: "http://repo.powerdns.com/centos/$basearch/$releasever/auth-50"
+  yum_debug_symbols_repo_baseurl: "http://repo.powerdns.com/centos/$basearch/$releasever/auth-50/debug"
+  name: "powerdns-auth-50"
+
 default_pdns_service_overrides: >-
   {{  { 'User'  : pdns_user
       , 'Group' : pdns_group