From 55d44f7b9bbedd83a4ffc63cc1ba5ffdd46f741c Mon Sep 17 00:00:00 2001
From: Kevin Coakley <kcoakley@sdsc.edu>
Date: Wed, 19 Oct 2022 10:24:56 -0700
Subject: [PATCH] Update molecule tests

---
 .github/workflows/molecule-test.yml | 7 +++++--
 molecule/ansible-lint.yml           | 7 +++++++
 molecule/default/molecule.yml       | 7 ++++---
 3 files changed, 16 insertions(+), 5 deletions(-)
 create mode 100644 molecule/ansible-lint.yml

diff --git a/.github/workflows/molecule-test.yml b/.github/workflows/molecule-test.yml
index 09ea701..6e5868d 100644
--- a/.github/workflows/molecule-test.yml
+++ b/.github/workflows/molecule-test.yml
@@ -8,7 +8,7 @@ jobs:
       fail-fast: false
       max-parallel: 4
       matrix:
-        molecule_distro: ['centos7', 'centos8', 'ubuntu1804', 'ubuntu2004']
+        molecule_distro: ['rockylinux8', 'ubuntu2004', 'ubuntu2204']
     env:
       ANSIBLE_CALLBACK_WHITELIST: profile_tasks
 
@@ -21,7 +21,10 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install ansible-lint flake8 molecule docker
+          pip install ansible ansible-lint flake8 molecule molecule-docker docker yamllint
+          ansible --version
+          ansible-lint --version
+          molecule --version
       - name: Test with molecule
         run: |
           molecule test --all
diff --git a/molecule/ansible-lint.yml b/molecule/ansible-lint.yml
new file mode 100644
index 0000000..e9ae42b
--- /dev/null
+++ b/molecule/ansible-lint.yml
@@ -0,0 +1,7 @@
+---
+warn_list:
+  - internal-error
+  - role-name
+  - fqcn-builtins
+skip_list:
+  - yaml
diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
index bb5d5fb..091198e 100644
--- a/molecule/default/molecule.yml
+++ b/molecule/default/molecule.yml
@@ -6,14 +6,15 @@ driver:
 lint: |
   set -e
   yamllint -c molecule/yaml-lint.yml .
-  ansible-lint
+  ansible-lint -c molecule/ansible-lint.yml .
   flake8
 platforms:
   - name: instance
-    image: "geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible:latest"
+    image: "geerlingguy/docker-${MOLECULE_DISTRO:-rockylinux8}-ansible:latest"
     command: ${MOLECULE_DOCKER_COMMAND:-""}
     volumes:
-      - /sys/fs/cgroup:/sys/fs/cgroup:ro
+      - /sys/fs/cgroup:/sys/fs/cgroup:rw
+    cgroupns_mode: host
     privileged: true
     pre_build_image: true
 provisioner: