Skip to content

Commit 7ed798a

Browse files
lpmhoubenRens Houben
lpmhouben
and
Rens Houben
authored
Update for DNSdist 19 and 20, and apt fixes (#152)
* Updated to install 18, 19, 20 or master * Also removed the deprecated apt-key method and updated debian method to use deb822 source files instead. Ansible-lint greenlights, looking at tests. * ARGH. Forgot to update the workflow doc * Fix typos and one error that ansible-lint missed * Update repo-RedHat.yml to use the new variable name * Someday I'll stop out-clevering myself. But apparently not today. * Add check for keyring dir (debian 11 and ubuntu-2004 don't have it by default * Removed dbgsyms, package isn't offered on repo * ... I need more caffeine. When condition fixed. * Fix conditional test in dbgsym * Couple of errors that ansible-lint didn't catch * Template fix. * Another template fix, hopefully the last * Force a handler flush to update the apt cache * Location, location, location * Ubuntu 20.04 is not supported past -19 * Removed ubuntu 20.04 entirely as per IRC request * Removed stray apt_sources_file line as per comment * Added trixie to tests for 2.0 and Master branches * Added Ubuntu 2404, commented out Debian 13 for now * Trixie tests added back in. * Removed trixie test for Master; see issue #155 #155 We'll re-add them when the images are built properly. --------- Co-authored-by: Rens Houben <rhouben@systemec.nl>
1 parent d501b77 commit 7ed798a

File tree

21 files changed

+144
-95
lines changed

21 files changed

+144
-95
lines changed

‎.github/workflows/main.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ jobs:
2323
- "2.15"
2424
- "2.16"
2525
scenario:
26-
- dnsdist-16
27-
- dnsdist-17
2826
- dnsdist-18
27+
- dnsdist-19
28+
- dnsdist-20
2929
- dnsdist-master
3030
steps:
3131
- name: checkout

‎.yamllint‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
---
22
extends: default
3-
43
rules:
54
braces:
65
max-spaces-inside: 1
@@ -14,7 +13,8 @@ rules:
1413
commas:
1514
max-spaces-after: -1
1615
level: error
17-
comments: disable
16+
comments:
17+
min-spaces-from-content: 1
1818
comments-indentation: disable
1919
document-start: disable
2020
empty-lines:
@@ -28,5 +28,8 @@ rules:
2828
new-line-at-end-of-file: disable
2929
new-lines:
3030
type: unix
31+
octal-values:
32+
forbid-implicit-octal: true
33+
forbid-explicit-octal: true
3134
trailing-spaces: disable
3235
truthy: disable

‎molecule/dnsdist-18/molecule.yml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,6 @@ platforms:
1818
image: oraclelinux:9
1919
dockerfile_tpl: centos-systemd
2020

21-
- name: ubuntu-2004
22-
image: ubuntu:20.04
23-
dockerfile_tpl: ubuntu-systemd
24-
2521
- name: ubuntu-2204
2622
image: ubuntu:22.04
2723
dockerfile_tpl: ubuntu-systemd

molecule/dnsdist-16/converge.yml renamed to molecule/dnsdist-19/converge.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
---
22

3-
- name: Dnsdist 1.6
3+
- name: Dnsdist 1.9
44
hosts: all
55
vars_files:
66
- ../resources/vars/dnsdist-common.yml
7-
- ../resources/vars/dnsdist-repo-16.yml
7+
- ../resources/vars/dnsdist-repo-19.yml
88
roles:
99
- { role: powerdns.dnsdist }

molecule/dnsdist-17/molecule.yml renamed to molecule/dnsdist-19/molecule.yml

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22

33
scenario:
4-
name: dnsdist-17
4+
name: dnsdist-19
55

66
driver:
77
name: docker
@@ -18,18 +18,22 @@ platforms:
1818
image: oraclelinux:9
1919
dockerfile_tpl: centos-systemd
2020

21-
- name: ubuntu-2004
22-
image: ubuntu:20.04
23-
dockerfile_tpl: ubuntu-systemd
24-
2521
- name: ubuntu-2204
2622
image: ubuntu:22.04
2723
dockerfile_tpl: ubuntu-systemd
2824

25+
- name: ubuntu-2404
26+
image: ubuntu:24.04
27+
dockerfile_tpl: ubuntu-systemd
28+
2929
- name: debian-11
3030
image: debian:11
3131
dockerfile_tpl: debian-python3
3232

33+
- name: debian-12
34+
image: debian:12
35+
dockerfile_tpl: debian-python3
36+
3337
- name: rockylinux-8
3438
image: rockylinux:8
3539
dockerfile_tpl: centos-systemd
@@ -59,7 +63,7 @@ provisioner:
5963
destroy: ../resources/destroy.yml
6064
prepare: ../resources/prepare.yml
6165

62-
lint: yamllint vars tasks defaults meta
66+
# lint: yamllint vars tasks defaults meta
6367

6468
verifier:
6569
name: testinfra
@@ -68,4 +72,4 @@ verifier:
6872
directory: ../resources/tests/all
6973
additional_files_or_dirs:
7074
# path relative to 'directory'
71-
- ../repo-17/
75+
- ../repo-19/

molecule/dnsdist-17/converge.yml renamed to molecule/dnsdist-20/converge.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
---
22

3-
- name: Dnsdist 1.7
3+
- name: Dnsdist 2.0
44
hosts: all
55
vars_files:
66
- ../resources/vars/dnsdist-common.yml
7-
- ../resources/vars/dnsdist-repo-17.yml
7+
- ../resources/vars/dnsdist-repo-20.yml
88
roles:
99
- { role: powerdns.dnsdist }

molecule/dnsdist-16/molecule.yml renamed to molecule/dnsdist-20/molecule.yml

Lines changed: 29 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22

33
scenario:
4-
name: dnsdist-16
4+
name: dnsdist-20
55

66
driver:
77
name: docker
@@ -14,14 +14,30 @@ platforms:
1414
image: oraclelinux:8
1515
dockerfile_tpl: centos-systemd
1616

17-
- name: ubuntu-2004
18-
image: ubuntu:20.04
17+
- name: oraclelinux-9
18+
image: oraclelinux:9
19+
dockerfile_tpl: centos-systemd
20+
21+
- name: ubuntu-2204
22+
image: ubuntu:22.04
23+
dockerfile_tpl: ubuntu-systemd
24+
25+
- name: ubuntu-2404
26+
image: ubuntu:24.04
1927
dockerfile_tpl: ubuntu-systemd
2028

2129
- name: debian-11
2230
image: debian:11
2331
dockerfile_tpl: debian-python3
2432

33+
- name: debian-12
34+
image: debian:12
35+
dockerfile_tpl: debian-python3
36+
37+
- name: debian-13
38+
image: debian:13
39+
dockerfile_tpl: debian-python3
40+
2541
- name: rockylinux-8
2642
image: rockylinux:8
2743
dockerfile_tpl: centos-systemd
@@ -30,6 +46,14 @@ platforms:
3046
image: almalinux:8
3147
dockerfile_tpl: centos-systemd
3248

49+
- name: rockylinux-9
50+
image: rockylinux:9.0
51+
dockerfile_tpl: centos-systemd
52+
53+
- name: almalinux-9
54+
image: almalinux:9
55+
dockerfile_tpl: centos-systemd
56+
3357
provisioner:
3458
name: ansible
3559
options:
@@ -43,7 +67,7 @@ provisioner:
4367
destroy: ../resources/destroy.yml
4468
prepare: ../resources/prepare.yml
4569

46-
lint: yamllint vars tasks defaults meta
70+
# lint: yamllint vars tasks defaults meta
4771

4872
verifier:
4973
name: testinfra
@@ -52,4 +76,4 @@ verifier:
5276
directory: ../resources/tests/all
5377
additional_files_or_dirs:
5478
# path relative to 'directory'
55-
- ../repo-16/
79+
- ../repo-20/

‎molecule/dnsdist-master/molecule.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@ platforms:
1818
image: oraclelinux:9
1919
dockerfile_tpl: centos-systemd
2020

21-
- name: ubuntu-2004
22-
image: ubuntu:20.04
23-
dockerfile_tpl: ubuntu-systemd
24-
2521
- name: ubuntu-2204
2622
image: ubuntu:22.04
2723
dockerfile_tpl: ubuntu-systemd
2824

25+
- name: ubuntu-2404
26+
image: ubuntu:24.04
27+
dockerfile_tpl: ubuntu-systemd
28+
2929
- name: debian-11
3030
image: debian:11
3131
dockerfile_tpl: debian-python3

‎molecule/resources/tests/repo-18/test_repo_18.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
def test_repo_file(host):
77
f = None
88
if host.system_info.distribution.lower() in debian_os:
9-
f = host.file('/etc/apt/sources.list.d/powerdns-dnsdist-18.list')
9+
f = host.file('/etc/apt/sources.list.d/powerdns-dnsdist-18.sources')
1010
if host.system_info.distribution.lower() in rhel_os:
1111
f = host.file('/etc/yum.repos.d/powerdns-dnsdist-18.repo')
1212

@@ -18,7 +18,7 @@ def test_repo_file(host):
1818
def test_pdns_repo(host):
1919
f = None
2020
if host.system_info.distribution.lower() in debian_os:
21-
f = host.file('/etc/apt/sources.list.d/powerdns-dnsdist-18.list')
21+
f = host.file('/etc/apt/sources.list.d/powerdns-dnsdist-18.sources')
2222
if host.system_info.distribution.lower() in rhel_os:
2323
f = host.file('/etc/yum.repos.d/powerdns-dnsdist-18.repo')
2424

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
def test_repo_file(host):
77
f = None
88
if host.system_info.distribution.lower() in debian_os:
9-
f = host.file('/etc/apt/sources.list.d/powerdns-dnsdist-16.list')
9+
f = host.file('/etc/apt/sources.list.d/powerdns-dnsdist-19.sources')
1010
if host.system_info.distribution.lower() in rhel_os:
11-
f = host.file('/etc/yum.repos.d/powerdns-dnsdist-16.repo')
11+
f = host.file('/etc/yum.repos.d/powerdns-dnsdist-19.repo')
1212

1313
assert f.exists
1414
assert f.user == 'root'
@@ -18,15 +18,15 @@ def test_repo_file(host):
1818
def test_pdns_repo(host):
1919
f = None
2020
if host.system_info.distribution.lower() in debian_os:
21-
f = host.file('/etc/apt/sources.list.d/powerdns-dnsdist-16.list')
21+
f = host.file('/etc/apt/sources.list.d/powerdns-dnsdist-19.sources')
2222
if host.system_info.distribution.lower() in rhel_os:
23-
f = host.file('/etc/yum.repos.d/powerdns-dnsdist-16.repo')
23+
f = host.file('/etc/yum.repos.d/powerdns-dnsdist-19.repo')
2424

2525
assert f.exists
26-
assert f.contains('dnsdist-16')
26+
assert f.contains('dnsdist-19')
2727

2828

2929
def test_pdns_version(host):
3030
cmd = host.run('/usr/bin/dnsdist --version')
3131

32-
assert 'dnsdist 1.6' in cmd.stdout
32+
assert 'dnsdist 1.9' in cmd.stdout

0 commit comments

Comments
 (0)