Merge pull request #11 from buluma/testing

Simpler; remove Rocky references, it's RedHat now

.github/workflows/molecule.yml

@@ -13,7 +13,7 @@ on:
       - '*'
   pull_request:
   schedule:
-    - cron: '19 10 10 * *'
+    - cron: '19 10 * * *'
   workflow_dispatch:
 
 jobs:
@@ -25,7 +25,7 @@ jobs:
         with:
           path: "${{ github.repository }}"
       - name: molecule
-        uses: buluma/molecule-action@v4.0.5
+        uses: buluma/molecule-action@v4.0.6
         with:
           command: lint
   test:
@@ -56,7 +56,7 @@ jobs:
       - name: parse apparmor for mysql
         run: sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
       - name: molecule
-        uses: buluma/molecule-action@v4.0.5
+        uses: buluma/molecule-action@v4.0.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
@@ -12,7 +12,7 @@ molecule:
   script:
     - image=${image} tag=${tag} molecule test
   rules:
-    - if: $CI_COMMIT_REF_NAME == "master"
+    - if: $CI_COMMIT_REF_NAME == "main"
   retry: 1
   parallel:
     matrix:

vars/main.yml

@@ -3,10 +3,9 @@
 
 _jenkins_requirements:
   default: []
-  RedHat: &redhat_requirements
+  RedHat:
     - initscripts
     - chkconfig
-  Rocky: *redhat_requirements
   Suse:
     - insserv-compat
 
@@ -15,8 +14,7 @@ jenkins_requirements: "{{ _jenkins_requirements[ansible_os_family] | default(_je
 _jenkins_configuration_directory:
   default: /etc/default
   Alpine: /etc/conf.d
-  RedHat: &redhat_configuration_directory /etc/sysconfig
-  Rocky: *redhat_configuration_directory
+  RedHat: /etc/sysconfig
   Suse: /etc/sysconfig
 
 jenkins_configuration_directory: "{{ _jenkins_configuration_directory[ansible_os_family] | default(_jenkins_configuration_directory['default'] ) }}"