feat: bring inline with other tests (#13)

AcroMedia · Jun 18, 2024 · 42c7b01 · 42c7b01
1 parent 467aafb
commit 42c7b01
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/.github/workflows/molecule.yml b/.github/workflows/molecule.yml
@@ -27,16 +27,21 @@ jobs:
     strategy:
       matrix:
         image:
-          - registry.gitlab.com/aussielunix/ansible/molecule-containers/ubuntu:jammy
-          - registry.gitlab.com/aussielunix/ansible/molecule-containers/ubuntu:focal
-          - registry.gitlab.com/aussielunix/ansible/molecule-containers/rockylinux:9
+          - 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-centos9-ansible:latest
+          - geerlingguy/docker-centos8-ansible:latest
+          - geerlingguy/docker-centos7-ansible:latest
     steps:
       - name: checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           path: "${{ github.repository }}"
       - name: molecule
-        uses: robertdebock/molecule-action@4.0.9
+        uses: robertdebock/molecule-action@6.0.1
         with:
           image: "${{ matrix.image }}"
           options: parallel

diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
@@ -6,7 +6,11 @@ driver:
   name: docker
 platforms:
   - name: instance
-    image: "registry.gitlab.com/aussielunix/ansible/molecule-containers/${MOLECULE_DISTRO:-ubuntu:jammy}"
+    image: "geerlingguy/docker-${MOLECULE_DISTRO:-ubuntu2004}-ansible:latest"
+    command: ${MOLECULE_DOCKER_COMMAND:-""}
+    cgroupns_mode: host
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:rw
     privileged: true
     pre_build_image: true
     override_command: false