Merge pull request #3 from AcroMedia/updates

Update support
AcroMedia · Jun 12, 2024 · 165158f · 165158f
2 parents 29412ad + 029c3ee
commit 165158f
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 5 deletions.
diff --git a/.github/workflows/molecule.yml b/.github/workflows/molecule.yml
@@ -27,9 +27,10 @@ jobs:
     strategy:
       matrix:
         image:
+          - geerlingguy/docker-ubuntu2404-ansible:latest
+          - geerlingguy/docker-ubuntu2204-ansible:latest
           - geerlingguy/docker-ubuntu2004-ansible:latest
           - geerlingguy/docker-ubuntu1804-ansible:latest
-          - geerlingguy/docker-ubuntu1604-ansible:latest
           - geerlingguy/docker-centos8-ansible:latest
           - geerlingguy/docker-centos7-ansible:latest
     steps:
@@ -38,7 +39,7 @@ jobs:
         with:
           path: "${{ github.repository }}"
       - name: molecule
-        uses: robertdebock/molecule-action@2.6.3
+        uses: robertdebock/molecule-action@6.0.1
         with:
           image: "${{ matrix.image }}"
           options: parallel

diff --git a/defaults/main.yml b/defaults/main.yml
@@ -21,11 +21,10 @@ essential_packages_common:
   - bc
   - screen
   - jq
-  - mlocate
   - net-tools
+  - "{{ (ansible_distribution_major_version|int < 22) | ternary('mlocate', 'plocate') }}"
 
 basic_packages_redhat: "{{ essential_packages_common + essential_packages_redhat_only }}"
-
 basic_packages_ubuntu: "{{ essential_packages_common + essential_packages_ubuntu_only }}"
 
 set_bash_history_timestamps: true
diff --git a/meta/main.yml b/meta/main.yml
@@ -12,9 +12,14 @@ galaxy_info:
       - trusty
       - xenial
       - bionic
+      - focal
+      - jammy
+      - noble
   - name: EL
     versions:
       - 6
+      - 7
+      - 8
 
   galaxy_tags: []
 dependencies: []
diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
@@ -1,4 +1,5 @@
 ---
+role_name_check: 1
 dependency:
   name: galaxy
 driver:
@@ -7,11 +8,20 @@ platforms:
   - name: instance
     image: ${MOLECULE_DOCKER_IMAGE:-'geerlingguy/docker-ubuntu1804-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:
+      - /tmp
+      - /run
+      - /run/lock
 provisioner:
   name: ansible
   playbooks:
     converge: ${MOLECULE_PLAYBOOK:-converge.yml}
+  config_options:
+    defaults:
+      verbosity: ${MOLECULE_VERBOSITY:-0}
+      remote_tmp: /tmp