Merge pull request #72 from staticdev/feature/improved-test-os-coverage

Improved test OS coverage

Author: staticdev

.github/workflows/tests.yml

@@ -38,8 +38,11 @@ jobs:
 
     strategy:
       matrix:
-        img:
-          - cisagov/docker-debian11-ansible:latest
+        distro:
+          - debian11
+          - debian10
+          - ubuntu2004
+
     steps:
       - name: Check out the repository
         uses: actions/checkout@v2.3.4
@@ -59,4 +62,4 @@ jobs:
         env:
           PY_COLORS: "1"
           ANSIBLE_FORCE_COLOR: "1"
-          MOLECULE_IMG: ${{ matrix.img }}
+          MOLECULE_DISTRO: ${{ matrix.distro }}

meta/main.yml

@@ -15,10 +15,7 @@ galaxy_info:
         - buster
     - name: Ubuntu
       versions:
-        - xenial
-        - bionic
         - focal
-        - groovy
 
   galaxy_tags:
     - python

molecule/default/molecule.yml

@@ -7,7 +7,7 @@ driver:
   name: docker
 platforms:
   - name: instance
-    image: "${MOLECULE_IMG:-cisagov/docker-debian11-ansible:latest}"
+    image: "geerlingguy/docker-${MOLECULE_DISTRO:-debian11}-ansible:latest"
     command: ${MOLECULE_DOCKER_COMMAND:-""}
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro

tasks/main.yml

@@ -14,7 +14,7 @@
   become: true
   with_items:
     - python3-pip
-    - python3-venv # needed for nox
+    - python3-venv  # needed for nox
 
 - name: Check if pipx is installed
   command: "{{ ansible_env.HOME }}/.local/bin/pipx --version"
@@ -30,7 +30,7 @@
 
 - name: Check if pre-commit is installed
   stat:
-    path: "{{ ansible_env.HOME }}/.local/pipx/venvs/pre-commit"
+    path: "{{ ansible_env.HOME }}/.local/bin/pre-commit"
   register: pre_commit_folder_check
 
 - name: Install pre-commit