Test updates

.github/workflows/molecule.yml

@@ -25,13 +25,12 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        config:
-          - image: "ubuntu"
-            tag: "latest"  # latest == noble, as of this writing.
-          - image: "ubuntu"
-            tag: "jammy"
-            # - image: "ubuntu"  # Not testing focal, because the "service start"
-            #   tag: "focal"     # task times out in molecule tests, and nobody knows why.
+        image:
+          - geerlingguy/docker-ubuntu2404-ansible:latest
+          - geerlingguy/docker-ubuntu2204-ansible:latest
+          - geerlingguy/docker-ubuntu2004-ansible:latest
+          - geerlingguy/docker-ubuntu1804-ansible:latest
+
     steps:
       - name: checkout
         uses: actions/checkout@v4

meta/main.yml

@@ -8,10 +8,12 @@
   license: GPLv3
   min_ansible_version: '2.0'
   platforms:
-    - name: Ubuntu
-      versions:
-        - focal
-        - jammy
-        - noble
-  galaxy_tags: [ ]
-dependencies: [ ]
+  - name: Ubuntu
+    versions:
+    - trusty
+    - xenial
+    - bionic
+    - jammy
+    - noble
+  galaxy_tags: []
+dependencies: []

molecule/default/molecule.yml

@@ -11,13 +11,17 @@ lint: |
 driver:
   name: docker
 platforms:
-  - name: "mariadb-${image:-ubuntu}-${tag:-latest}${TOX_ENVNAME}"
-    image: "${namespace:-robertdebock}/${image:-ubuntu}:${tag:-latest}"
-    command: /sbin/init
+  - name: instance
+    image: "geerlingguy/docker-${MOLECULE_DISTRO:-ubuntu2004}-ansible:latest"
+    command: ${MOLECULE_DOCKER_COMMAND:-""}
+    cgroupns_mode: host
     volumes:
-      - /sys/fs/cgroup:/sys/fs/cgroup:ro
+      - /sys/fs/cgroup:/sys/fs/cgroup:rw
     privileged: true
     pre_build_image: true
+    tmpfs:
+      - /run
+      - /tmp
 provisioner:
   name: ansible
 verifier:

tasks/main.yml

@@ -1,14 +1,12 @@
----
-- name: Define the list of supported ubuntu versions
-  ansible.builtin.set_fact:
+- set_fact:
     _supported_ubuntu_versions:
       - '18.04'
       - '20.04'
       - '22.04'
       - '24.04'
 
 - name: Check if OS is Ubuntu LTS
-  ansible.builtin.assert:
+  assert:
     that:
       - ansible_distribution == 'Ubuntu'
       - ansible_distribution_version in _supported_ubuntu_versions
@@ -71,11 +69,18 @@
       - python3-mysqldb
     state: present
 
-- name: Install MariaDB Server
-  when: not client_only
-  block:
-    - name: Ensure mariadb service is running and starts on boot
-      ansible.builtin.service:
+- block:
+    - name: Ensure mysql is running and starts on boot
+      when: ansible_distribution == 'Ubuntu' and ansible_distribution_version is version("24.04", "<")
+      service:
+        name: mysql
+        state: started
+        enabled: true
+
+    # Service name changes in newer Ubuntu versions
+    - name: Ensure mariadb is running and starts on boot
+      when: ansible_distribution == 'Ubuntu' and ansible_distribution_version is version("24.04", ">=")
+      service:
         name: mariadb
         state: started
         enabled: true