From 79f57b3d65df1bd994fbf7c6ff9fa0100ae144fc Mon Sep 17 00:00:00 2001
From: Daniel Akulenok <gitlab@valid.dk>
Date: Fri, 23 Jan 2026 00:30:22 +0100
Subject: [PATCH] test: Configure Molecule testing framework

- Add Ansible collections configuration
- Update converge and prepare playbooks
- Restructure molecule.yml for improved testing
---
 handlers/main.yml                |  2 +-
 molecule/default/collections.yml |  7 +++++++
 molecule/default/converge.yml    |  6 ++++--
 molecule/default/molecule.yml    | 31 +++++++++++++++++--------------
 molecule/default/prepare.yml     |  6 ++++++
 5 files changed, 35 insertions(+), 17 deletions(-)
 create mode 100644 molecule/default/collections.yml
 create mode 100644 molecule/default/prepare.yml

diff --git a/handlers/main.yml b/handlers/main.yml
index f00c67b..f37a250 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -18,7 +18,7 @@
       - "{{ bind9_libdir }}"
     dest: "{{
       bind9_backup_dir + '/bind9-config-' +
-      ansible_date_time.iso8601_basic_short + '.tar.gz' }}"
+      ansible_facts.date_time.iso8601_basic_short + '.tar.gz' }}"
     owner: root
     group: root
     mode: 0640
diff --git a/molecule/default/collections.yml b/molecule/default/collections.yml
new file mode 100644
index 0000000..6f4772f
--- /dev/null
+++ b/molecule/default/collections.yml
@@ -0,0 +1,7 @@
+---
+collections:
+  - name: ansible.utils
+  - name: ansible.posix
+  - name: community.crypto
+  - name: community.general
+
diff --git a/molecule/default/converge.yml b/molecule/default/converge.yml
index ac3ff8c..d63642f 100644
--- a/molecule/default/converge.yml
+++ b/molecule/default/converge.yml
@@ -1,5 +1,7 @@
 ---
 - name: Converge
   hosts: all
-  roles:
-    - keepit.bind9
+  tasks:
+    - name: Include bind9 role
+      ansible.builtin.include_role:
+        name: ../../../ansible-bind9-role
diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
index 8ea2e57..c5ae4d5 100644
--- a/molecule/default/molecule.yml
+++ b/molecule/default/molecule.yml
@@ -1,22 +1,25 @@
 ---
-dependency:
-  name: galaxy
 driver:
   name: podman
 platforms:
-  - name: ubuntu-jammy
-    image: ubuntu:jammy
-  - name: ubuntu-focal
-    image: ubuntu:focal
-  - name: debian-bullseye
-    image: debian:bullseye
+  - name: debian-bookworm
+    image: docker.io/jrei/systemd-debian:12
+    command: /lib/systemd/systemd
+    privileged: true
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:rw
+    cgroupns_mode: host
+  - name: debian-trixie
+    image: docker.io/jrei/systemd-debian:13
+    command: /lib/systemd/systemd
+    privileged: true
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:rw
+    cgroupns_mode: host
 provisioner:
   name: ansible
-  lint:
-    name: ansible-lint
+  config_options:
+    defaults:
+      ALLOW_BROKEN_CONDITIONALS: true
 verifier:
   name: ansible
-lint: |
-  set -e
-  ansible-lint .
-  yamllint .
diff --git a/molecule/default/prepare.yml b/molecule/default/prepare.yml
new file mode 100644
index 0000000..b3823cd
--- /dev/null
+++ b/molecule/default/prepare.yml
@@ -0,0 +1,6 @@
+---
+- hosts: all
+  tasks:
+    - name: Update apt
+      ansible.builtin.apt:
+        update_cache: true