Merge pull request #155 from npmdnl/npmdnl-add-debs

Added Debian bullseye and bookworm in CI - updated galaxy meta info
PowerDNS · Jan 12, 2024 · 86dc4fa · 86dc4fa
2 parents 6cc67ae + 37b0192
commit 86dc4fa
Show file tree

Hide file tree

Showing 8 changed files with 65 additions and 2 deletions.
diff --git a/meta/main.yml b/meta/main.yml
@@ -15,11 +15,11 @@ galaxy_info:
         - 8
     - name: Debian
       versions:
-        - buster
         - bullseye
+        - buster
+        - bookworm
     - name: Ubuntu
       versions:
-        - bionic
         - focal
         - jammy
     - name: FreeBSD

diff --git a/molecule/pdns-rec-48/molecule.yml b/molecule/pdns-rec-48/molecule.yml
@@ -30,6 +30,14 @@ platforms:
     image: debian:10
     dockerfile_tpl: debian-systemd
 
+  - name: debian-11
+    image: debian:11
+    dockerfile_tpl: debian-python3
+
+  - name: debian-12
+    image: debian:12
+    dockerfile_tpl: debian-python3
+
 provisioner:
   name: ansible
   options:

diff --git a/molecule/pdns-rec-49/molecule.yml b/molecule/pdns-rec-49/molecule.yml
@@ -30,6 +30,14 @@ platforms:
     image: debian:10
     dockerfile_tpl: debian-systemd
 
+  - name: debian-11
+    image: debian:11
+    dockerfile_tpl: debian-python3
+
+  - name: debian-12
+    image: debian:12
+    dockerfile_tpl: debian-python3
+
 provisioner:
   name: ansible
   options:

diff --git a/molecule/pdns-rec-50/molecule.yml b/molecule/pdns-rec-50/molecule.yml
@@ -30,6 +30,14 @@ platforms:
     image: debian:10
     dockerfile_tpl: debian-systemd
 
+  - name: debian-11
+    image: debian:11
+    dockerfile_tpl: debian-python3
+
+  - name: debian-12
+    image: debian:12
+    dockerfile_tpl: debian-python3
+
 provisioner:
   name: ansible
   options:

diff --git a/molecule/pdns-rec-master/molecule.yml b/molecule/pdns-rec-master/molecule.yml
@@ -30,6 +30,14 @@ platforms:
     image: debian:10
     dockerfile_tpl: debian-systemd
 
+  - name: debian-11
+    image: debian:11
+    dockerfile_tpl: debian-python3
+
+  - name: debian-12
+    image: debian:12
+    dockerfile_tpl: debian-python3
+
 provisioner:
   name: ansible
   options:

diff --git a/molecule/resources/Dockerfile.debian-python3.j2 b/molecule/resources/Dockerfile.debian-python3.j2
@@ -0,0 +1,25 @@
+# Molecule managed
+
+FROM {{ item.image }}
+
+RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get upgrade -y && apt-get install -y systemd && apt-get clean; fi
+RUN if [ ! -e /sbin/init ]; then ln -s /lib/systemd/systemd /sbin/init ; fi
+
+ENV container docker
+
+# Don't start the optional systemd services. 
+RUN find /etc/systemd/system \
+         /lib/systemd/system \
+         -path '*.wants/*' \
+         -not -name '*journald*' \
+         -not -name '*systemd-tmpfiles*' \
+         -not -name '*systemd-user-sessions*' \
+         -exec rm \{} \;
+
+RUN systemctl set-default multi-user.target
+
+VOLUME [ "/sys/fs/cgroup" ]
+
+CMD ["/sbin/init"]
+
+RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get upgrade -y && apt-get install -y python3 sudo bash net-tools ca-certificates && apt-get clean; fi
diff --git a/molecule/resources/host_vars/debian-11.yml b/molecule/resources/host_vars/debian-11.yml
@@ -0,0 +1,3 @@
+---
+
+ansible_python_interpreter: "/usr/bin/python3"
diff --git a/molecule/resources/host_vars/debian-12.yml b/molecule/resources/host_vars/debian-12.yml
@@ -0,0 +1,3 @@
+---
+
+ansible_python_interpreter: "/usr/bin/python3"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		---

		ansible_python_interpreter: "/usr/bin/python3"