Updated Molecule and Ansible to resolve failures

mrlesmithjr · Dec 21, 2023 · bfa2af5 · bfa2af5
1 parent 9ce8147
commit bfa2af5
Show file tree

Hide file tree

Showing 13 changed files with 893 additions and 420 deletions.
diff --git a/.github/workflows/default.yml b/.github/workflows/default.yml
@@ -1,30 +1,22 @@
 ---
 name: Molecule Test
-on: push
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      max-parallel: 4
-      matrix:
-        molecule_distro:
-          # - centos7
-          - centos8
-          # - debian8
-          - debian9
-          - debian10
-          # - fedora
-          # - ubuntu1604
-          - ubuntu1804
-          - ubuntu2004
+on:
+  push:
+    branches-ignore:
+      - main
+      - master
+  pull_request:
+    branches:
+      - develop
+      - main
+      - master
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           submodules: recursive
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
       - uses: actions/cache@v2

diff --git a/molecule/centos7/molecule.yml b/molecule/centos7/molecule.yml
@@ -12,17 +12,21 @@ lint: |
   flake8
 platforms:
   - name: centos7
-    image: jrei/systemd-centos:7
+    image: mrlesmithjr/centos:7
     privileged: true
     command: /usr/sbin/init
-    tmpfs:
-      - /run
-      - /tmp
+    # tmpfs:
+    #   - /run
+    #   - /tmp
     volumes:
-      - /sys/fs/cgroup:/sys/fs/cgroup:ro
+      - /sys/fs/cgroup:/sys/fs/cgroup:rw
+    cgroupns_mode: host
+    # groups: []
 provisioner:
   name: ansible
   playbooks:
     converge: ../shared/converge.yml
+    prepare: ../shared/prepare.yml
+    verify: ../shared/verify.yml
 verifier:
   name: ansible
diff --git a/molecule/centos8/molecule.yml b/molecule/centos8/molecule.yml
@@ -12,17 +12,21 @@ lint: |
   flake8
 platforms:
   - name: centos8
-    image: jrei/systemd-centos:8
+    image: mrlesmithjr/centos:8
     privileged: true
     command: /usr/sbin/init
-    tmpfs:
-      - /run
-      - /tmp
+    # tmpfs:
+    #   - /run
+    #   - /tmp
     volumes:
-      - /sys/fs/cgroup:/sys/fs/cgroup:ro
+      - /sys/fs/cgroup:/sys/fs/cgroup:rw
+    cgroupns_mode: host
+    # groups: []
 provisioner:
   name: ansible
   playbooks:
     converge: ../shared/converge.yml
+    prepare: ../shared/prepare.yml
+    verify: ../shared/verify.yml
 verifier:
   name: ansible
diff --git a/molecule/debian10/molecule.yml b/molecule/debian10/molecule.yml
@@ -12,17 +12,21 @@ lint: |
   flake8
 platforms:
   - name: debian10
-    image: jrei/systemd-debian:10
+    image: mrlesmithjr/debian:10
     privileged: true
     command: /lib/systemd/systemd
-    tmpfs:
-      - /run
-      - /tmp
+    # tmpfs:
+    #   - /run
+    #   - /tmp
     volumes:
-      - /sys/fs/cgroup:/sys/fs/cgroup:ro
+      - /sys/fs/cgroup:/sys/fs/cgroup:rw
+    cgroupns_mode: host
+    # groups: []
 provisioner:
   name: ansible
   playbooks:
     converge: ../shared/converge.yml
+    prepare: ../shared/prepare.yml
+    verify: ../shared/verify.yml
 verifier:
   name: ansible
diff --git a/molecule/debian8/molecule.yml b/molecule/debian8/molecule.yml
@@ -12,17 +12,21 @@ lint: |
   flake8
 platforms:
   - name: debian8
-    image: jrei/systemd-debian:8
+    image: mrlesmithjr/debian:8
     privileged: true
     command: /lib/systemd/systemd
-    tmpfs:
-      - /run
-      - /tmp
+    # tmpfs:
+    #   - /run
+    #   - /tmp
     volumes:
-      - /sys/fs/cgroup:/sys/fs/cgroup:ro
+      - /sys/fs/cgroup:/sys/fs/cgroup:rw
+    cgroupns_mode: host
+    # groups: []
 provisioner:
   name: ansible
   playbooks:
     converge: ../shared/converge.yml
+    prepare: ../shared/prepare.yml
+    verify: ../shared/verify.yml
 verifier:
   name: ansible
diff --git a/molecule/debian9/molecule.yml b/molecule/debian9/molecule.yml
@@ -12,17 +12,21 @@ lint: |
   flake8
 platforms:
   - name: debian9
-    image: jrei/systemd-debian:9
+    image: mrlesmithjr/debian:9
     privileged: true
     command: /lib/systemd/systemd
-    tmpfs:
-      - /run
-      - /tmp
+    # tmpfs:
+    #   - /run
+    #   - /tmp
     volumes:
-      - /sys/fs/cgroup:/sys/fs/cgroup:ro
+      - /sys/fs/cgroup:/sys/fs/cgroup:rw
+    cgroupns_mode: host
+    # groups: []
 provisioner:
   name: ansible
   playbooks:
     converge: ../shared/converge.yml
+    prepare: ../shared/prepare.yml
+    verify: ../shared/verify.yml
 verifier:
   name: ansible
diff --git a/molecule/ubuntu1604/molecule.yml b/molecule/ubuntu1604/molecule.yml
@@ -12,17 +12,21 @@ lint: |
   flake8
 platforms:
   - name: ubuntu1604
-    image: jrei/systemd-ubuntu:16.04
+    image: mrlesmithjr/ubuntu:16.04
     privileged: true
     command: /lib/systemd/systemd
-    tmpfs:
-      - /run
-      - /tmp
+    # tmpfs:
+    #   - /run
+    #   - /tmp
     volumes:
-      - /sys/fs/cgroup:/sys/fs/cgroup:ro
+      - /sys/fs/cgroup:/sys/fs/cgroup:rw
+    cgroupns_mode: host
+    # groups: []
 provisioner:
   name: ansible
   playbooks:
     converge: ../shared/converge.yml
+    prepare: ../shared/prepare.yml
+    verify: ../shared/verify.yml
 verifier:
   name: ansible
diff --git a/molecule/ubuntu1804/molecule.yml b/molecule/ubuntu1804/molecule.yml
@@ -12,17 +12,21 @@ lint: |
   flake8
 platforms:
   - name: ubuntu1804
-    image: jrei/systemd-ubuntu:18.04
+    image: mrlesmithjr/ubuntu:18.04
     privileged: true
     command: /lib/systemd/systemd
-    tmpfs:
-      - /run
-      - /tmp
+    # tmpfs:
+    #   - /run
+    #   - /tmp
     volumes:
-      - /sys/fs/cgroup:/sys/fs/cgroup:ro
+      - /sys/fs/cgroup:/sys/fs/cgroup:rw
+    cgroupns_mode: host
+    # groups: []
 provisioner:
   name: ansible
   playbooks:
     converge: ../shared/converge.yml
+    prepare: ../shared/prepare.yml
+    verify: ../shared/verify.yml
 verifier:
   name: ansible
diff --git a/molecule/ubuntu2004/molecule.yml b/molecule/ubuntu2004/molecule.yml
@@ -12,17 +12,21 @@ lint: |
   flake8
 platforms:
   - name: ubuntu2004
-    image: jrei/systemd-ubuntu:20.04
+    image: mrlesmithjr/ubuntu:20.04
     privileged: true
     command: /lib/systemd/systemd
-    tmpfs:
-      - /run
-      - /tmp
+    # tmpfs:
+    #   - /run
+    #   - /tmp
     volumes:
-      - /sys/fs/cgroup:/sys/fs/cgroup:ro
+      - /sys/fs/cgroup:/sys/fs/cgroup:rw
+    cgroupns_mode: host
+    # groups: []
 provisioner:
   name: ansible
   playbooks:
-    converge: converge.yml
+    converge: ../shared/converge.yml
+    prepare: ../shared/prepare.yml
+    verify: ../shared/verify.yml
 verifier:
   name: ansible