switch from diodonfrost container to my own

.github/workflows/main.yml

@@ -42,15 +42,13 @@ jobs:
       fail-fast: false
       matrix:
         image:
-          - debian:9
           - debian:10
           - debian:11
-          - ubuntu:18.04
           - ubuntu:20.04
         python-version:
           - '3.9'
         ansible-version:
-          - '3.4.0'
+          - '4.1.0'
           - '5.1.0'
 
     steps:
@@ -93,7 +91,7 @@ jobs:
         python-version:
           - '3.9'
         ansible-version:
-          - '3.4.0'
+          - '4.1.0'
           - '5.1.0'
 
     steps:

Makefile

@@ -0,0 +1,20 @@
+#
+export TOX_SCENARIO  ?= default
+export TOX_PYTHON    ?= py310
+export TOX_ANSIBLE   ?= ansible510
+
+.PHONY: converge destroy verify lint
+
+default: converge
+
+converge:
+	@hooks/converge
+
+destroy:
+	@hooks/destroy
+
+verify:
+	@hooks/verify
+
+lint:
+	@hooks/lint

README.md

@@ -24,7 +24,6 @@ Tested on
     - Debian 10 / 11
     - Ubuntu 20.10
 * RedHat based
-    - CentOS 8 (**not longer supported**)
     - Alma Linux 8
     - Rocky Linux 8
     - Oracle Linux 8

hooks/converge

@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+
+TOX_ARGS=
+
+if [ -n "${TOX_SCENARIO}" ]
+then
+  TOX_ARGS="--scenario-name ${TOX_SCENARIO}"
+fi
+
+tox -e ${TOX_PYTHON}-${TOX_ANSIBLE} -- molecule converge ${TOX_ARGS}

hooks/destroy

@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+
+TOX_ARGS=
+
+if [ -n "${TOX_SCENARIO}" ]
+then
+  TOX_ARGS="--scenario-name ${TOX_SCENARIO}"
+fi
+
+tox -e ${TOX_PYTHON}-${TOX_ANSIBLE} -- molecule destroy ${TOX_ARGS}

hooks/lint

@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+
+TOX_ARGS=
+
+if [ -n "${TOX_SCENARIO}" ]
+then
+  TOX_ARGS="--scenario-name ${TOX_SCENARIO}"
+fi
+
+tox -e ${TOX_PYTHON}-${TOX_ANSIBLE} -- molecule lint ${TOX_ARGS}

hooks/verify

@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+
+TOX_ARGS=
+
+if [ -n "${TOX_SCENARIO}" ]
+then
+  TOX_ARGS="--scenario-name ${TOX_SCENARIO}"
+fi
+
+tox -e ${TOX_PYTHON}-${TOX_ANSIBLE} -- molecule verify ${TOX_ARGS}

meta/main.yaml

@@ -6,26 +6,23 @@ galaxy_info:
 
   author: Bodo Schulz
   description: ansible role for handling snapd
+
   license: "BSD"
   min_ansible_version: 2.9
+
   platforms:
-    - name: Ubuntu
-      versions:
-        # 18.04
-        - bionic
-        # 20.04
-        - focal
     - name: Debian
       versions:
-        # 9
-        - etch
         # 10
         - buster
+        - bullseye
+    - name: Ubuntu
+      versions:
+        # 20.04
+        - focal
     - name: EL
       versions:
-        - 7
         - 8
-    - name: ArchLinux
 
   galaxy_tags: []
 

molecule/default/molecule.yml

@@ -13,7 +13,7 @@ lint: |
 
 platforms:
   - name: instance
-    image: "diodonfrost/ansible-${DISTRIBUTION:-debian:10}"
+    image: "bodsch/ansible-${DISTRIBUTION:-debian:11}"
     command: ${MOLECULE_DOCKER_COMMAND:-""}
     docker_host: "${DOCKER_HOST:-unix://run/docker.sock}"
     privileged: true
@@ -30,6 +30,7 @@ provisioner:
     defaults:
       deprecation_warnings: True
       stdout_callback: yaml
+      callbacks_enabled: profile_tasks
 
 scenario:
   test_sequence:

test-requirements.txt

@@ -1,6 +1,6 @@
 ansible-lint==5.4.0
-molecule==3.4.0
-molecule-docker==0.2.4
+molecule==3.6.1
+molecule-docker==1.1.0
 docker==5.0.0
 yamllint==1.26.3
 flake8==3.9.2