Merge pull request #34 from ganto/feature/molecule-fixes

Refresh molecule configuration

.github/workflows/ci.yml

@@ -33,8 +33,8 @@ jobs:
       - name: Install test dependencies.
         run: pip3 install yamllint ansible-lint
 
-      - name: Install Ansible collections
-        run: ansible-galaxy install -r molecule/default/collections.yml
+      - name: Install Ansible collections.
+        run: ansible-galaxy install -r molecule/docker/collections.yml
 
       - name: Add checkout to Ansible role path.
         run: |

README.md

@@ -1,6 +1,6 @@
 ## Ansible Role: ganto.acme_tiny
 
-[![CI](https://github.com/ganto/ansible-acme_tiny/workflows/CI/badge.svg?event=push)](https://github.com/ganto/ansible-acme_tiny/actions?query=workflow%3ACI)
+[![CI](https://github.com/ganto/ansible-acme_tiny/actions/workflows/ci.yml/badge.svg)](https://github.com/ganto/ansible-acme_tiny/actions/workflows/ci.yml)
 [![Ansible Galaxy](http://img.shields.io/badge/ansible--galaxy-ganto.acme__tiny-blue.svg?style=flat&logo=ansible)](https://galaxy.ansible.com/ganto/acme_tiny)
 [![Read the Docs](https://img.shields.io/badge/docs-gantoacme--tiny-darkblue.svg?style=flat&logo=read-the-docs)](https://gantoacme-tiny.readthedocs.io/)
 

molecule/docker/molecule.yml

@@ -1,31 +1,37 @@
 ---
-# Copyright (C) 2021 Reto Gantenbein <reto.gantenbein@linuxmonk.ch>
+# Copyright (C) 2021-2025 Reto Gantenbein <reto.gantenbein@linuxmonk.ch>
 # SPDX-License-Identifier: Apache-2.0
 
 dependency:
   name: galaxy
   options:
-    requirements-file: collections.yml
+    requirements-file: molecule/docker/collections.yml
 driver:
   name: docker
 platforms:
   - name: instance
-    image: "geerlingguy/docker-debian11-ansible:latest"
+    image: "docker.io/geerlingguy/docker-debian11-ansible:latest"
+    pre_build_image: True
     command: ${MOLECULE_DOCKER_COMMAND:-""}
+    privileged: True
+    cgroupns_mode: host
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:rw
-    cgroupns_mode: host
-    privileged: true
-    pre_build_image: true
 provisioner:
   name: ansible
+  log: True
+  options:
+    vvv: True
   playbooks:
     converge: ${MOLECULE_PLAYBOOK:-converge.yml}
 scenario:
   test_sequence:
+    - dependency
+    - destroy
     - syntax
     - create
     - prepare
     - converge
     - verify
+    - cleanup
     - destroy

molecule/podman/collections.yml

@@ -1,3 +1,4 @@
 ---
 collections:
-  - community.crypto
+  - name: community.crypto
+  - name: community.docker

molecule/podman/molecule.yml

@@ -1,30 +1,37 @@
 ---
-# Copyright (C) 2021 Reto Gantenbein <reto.gantenbein@linuxmonk.ch>
+# Copyright (C) 2021-2025 Reto Gantenbein <reto.gantenbein@linuxmonk.ch>
 # SPDX-License-Identifier: Apache-2.0
 
 dependency:
   name: galaxy
   options:
-    requirements-file: collections.yml
+    requirements-file: molecule/podman/collections.yml
 driver:
   name: podman
 platforms:
   - name: instance
-    image: "geerlingguy/docker-debian11-ansible:latest"
+    image: "docker.io/geerlingguy/docker-debian11-ansible:latest"
+    pre_build_image: True
     command: ${MOLECULE_DOCKER_COMMAND:-""}
+    privileged: True
+    cgroupns_mode: host
     volumes:
-      - /sys/fs/cgroup:/sys/fs/cgroup:ro
-    privileged: true
-    pre_build_image: true
+      - /sys/fs/cgroup:/sys/fs/cgroup:rw
 provisioner:
   name: ansible
+  log: True
+  options:
+    vvv: True
   playbooks:
     converge: ${MOLECULE_PLAYBOOK:-converge.yml}
 scenario:
   test_sequence:
+    - dependency
+    - destroy
     - syntax
     - create
     - prepare
     - converge
     - verify
+    - cleanup
     - destroy