version bump/drop EL

.github/workflows/molecule.yml

@@ -13,7 +13,7 @@ on:
       - '*'
   pull_request:
   schedule:
-    - cron: '51 22 26 * *'
+    - cron: '51 22 * * *'
   workflow_dispatch:
 
 jobs:
@@ -25,7 +25,7 @@ jobs:
         with:
           path: "${{ github.repository }}"
       - name: molecule
-        uses: buluma/[email protected].5
+        uses: buluma/[email protected].6
         with:
           command: lint
   test:
@@ -44,6 +44,8 @@ jobs:
             tag: "latest"
           - image: "docker-ubuntu-systemd"
             tag: "bionic"
+          - image: "docker-ubuntu-systemd"
+            tag: "focal"
     steps:
       - name: checkout
         uses: actions/[email protected]
@@ -54,7 +56,7 @@ jobs:
       - name: parse apparmor for mysql
         run: sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
       - name: molecule
-        uses: buluma/[email protected].5
+        uses: buluma/[email protected].6
         with:
           image: ${{ matrix.config.image }}
           tag: ${{ matrix.config.tag }}

.gitlab-ci.yml

@@ -1,5 +1,5 @@
 ---
-image: "buluma/github-action-molecule:4.0.5"
+image: "buluma/github-action-molecule:4.0.6"
 
 services:
   - docker:dind
@@ -13,7 +13,7 @@ molecule:
     - image=${image} tag=${tag} molecule test
   rules:
     - if: $CI_COMMIT_REF_NAME == "main"
-  retry: 2
+  retry: 1
   parallel:
     matrix:
       - image: "debian-systemd"
@@ -24,13 +24,15 @@ molecule:
         tag: "latest"
       - image: "docker-ubuntu-systemd"
         tag: "bionic"
+      - image: "docker-ubuntu-systemd"
+        tag: "focal"
 
 testing:
   script:
     - image=${image} tag=${tag} molecule test
   rules:
     - if: $CI_COMMIT_REF_NAME == "testing"
-  retry: 2
+  retry: 1
   parallel:
     matrix:
       - image: "debian-systemd"
@@ -41,13 +43,15 @@ testing:
         tag: "latest"
       - image: "docker-ubuntu-systemd"
         tag: "bionic"
+      - image: "docker-ubuntu-systemd"
+        tag: "focal"
 
 role_testing:
   script:
     - image=${image} tag=${tag} ansible-galaxy install buluma.zabbix_web
   rules:
     - if: $CI_COMMIT_REF_NAME == "testing"
-  retry: 2
+  retry: 1
   parallel:
     matrix:
       - image: "debian-systemd"
@@ -58,6 +62,8 @@ role_testing:
         tag: "latest"
       - image: "docker-ubuntu-systemd"
         tag: "bionic"
+      - image: "docker-ubuntu-systemd"
+        tag: "focal"
 
 galaxy:
   script:
@@ -66,7 +72,7 @@ galaxy:
 role_testing_live:
   script:
     - image=${image} tag=${tag} ansible-galaxy install buluma.zabbix_web
-  retry: 2
+  retry: 1
   parallel:
     matrix:
       - image: "debian-systemd"
@@ -77,3 +83,5 @@ role_testing_live:
         tag: "latest"
       - image: "docker-ubuntu-systemd"
         tag: "bionic"
+      - image: "docker-ubuntu-systemd"
+        tag: "focal"

meta/main.yml

@@ -9,9 +9,6 @@ galaxy_info:
   min_ansible_version: "2.10"
 
   platforms:
-    - name: EL
-      versions:
-        - 8
     - name: Debian
       versions:
         - bullseye