Updated action and container, newer components.

robertdebock · Nov 11, 2023 · fb08301 · fb08301
1 parent 59e462d
commit fb08301
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 24 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -4,7 +4,7 @@ about: Create a report to help me improve
 
 ---
 
-## Describe the bug
+# Describe the bug
 
 A clear and concise description of what the bug is.
 
@@ -13,7 +13,6 @@ A clear and concise description of what the bug is.
 Please paste the playbook you are using. (Consider `requirements.yml` and
 optionally the command you've invoked.)
 
-
 ```yaml
 ---
 YOUR PLAYBOOK HERE

diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -4,7 +4,7 @@ about: Suggest an idea for this project
 
 ---
 
-## Proposed feature
+# Proposed feature
 
 A clear and concise description of what you want to happen.
 

diff --git a/.github/workflows/molecule.yml b/.github/workflows/molecule.yml
@@ -42,9 +42,11 @@ jobs:
           - image: "debian"
             tag: "bullseye"
           - image: "fedora"
-            tag: "37"
+            tag: "38"
           - image: "fedora"
             tag: "latest"
+          - image: "fedora"
+            tag: "rawhide"
           - image: "opensuse"
             tag: "latest"
           - image: "ubuntu"
@@ -58,12 +60,12 @@ jobs:
         uses: actions/checkout@v3
         with:
           path: "${{ github.repository }}"
-      - name: disable apparmor for mysql
-        run: sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
-      - name: parse apparmor for mysql
-        run: sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
+      # - name: disable apparmor for mysql
+      #   run: sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
+      # - name: parse apparmor for mysql
+      #   run: sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
       - name: molecule
-        uses: robertdebock/[email protected].0
+        uses: robertdebock/[email protected].1
         with:
           image: ${{ matrix.config.image }}
           tag: ${{ matrix.config.tag }}
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -1,5 +1,5 @@
 ---
-image: "robertdebock/github-action-molecule:6.0.0"
+image: "robertdebock/github-action-molecule:6.0.1"
 
 variables:
   PY_COLORS: 1
@@ -25,9 +25,11 @@ molecule:
       - image: "debian"
         tag: "bullseye"
       - image: "fedora"
-        tag: "37"
+        tag: "38"
       - image: "fedora"
         tag: "latest"
+      - image: "fedora"
+        tag: "rawhide"
       - image: "opensuse"
         tag: "latest"
       - image: "ubuntu"

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -11,7 +11,8 @@ repos:
     rev: v1.32.0
     hooks:
       - id: yamllint
-        args: [-c=.yamllint]
+        args:
+          - -c=.yamllint
 
   - repo: https://github.com/robertdebock/pre-commit
     rev: v1.5.2

diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# [java](#java)
+# Ansible role [java](#java)
 
 Install and configure java on your system.
 
@@ -107,13 +107,13 @@ This role has been tested on these [container images](https://hub.docker.com/u/r
 
 |container|tags|
 |---------|----|
-|[Alpine](https://hub.docker.com/repository/docker/robertdebock/alpine/general)|all|
-|[Amazon](https://hub.docker.com/repository/docker/robertdebock/amazonlinux/general)|Candidate|
-|[EL](https://hub.docker.com/repository/docker/robertdebock/enterpriselinux/general)|8, 9|
-|[Debian](https://hub.docker.com/repository/docker/robertdebock/debian/general)|all|
-|[Fedora](https://hub.docker.com/repository/docker/robertdebock/fedora/general)|all|
-|[opensuse](https://hub.docker.com/repository/docker/robertdebock/opensuse/general)|all|
-|[Ubuntu](https://hub.docker.com/repository/docker/robertdebock/ubuntu/general)|all|
+|[Alpine](https://hub.docker.com/r/robertdebock/alpine)|all|
+|[Amazon](https://hub.docker.com/r/robertdebock/amazonlinux)|Candidate|
+|[EL](https://hub.docker.com/r/robertdebock/enterpriselinux)|8, 9|
+|[Debian](https://hub.docker.com/r/robertdebock/debian)|all|
+|[Fedora](https://hub.docker.com/r/robertdebock/fedora/)|all|
+|[opensuse](https://hub.docker.com/r/robertdebock/opensuse)|all|
+|[Ubuntu](https://hub.docker.com/r/robertdebock/ubuntu)|all|
 
 The minimum version of Ansible required is 2.12, tests have been done to:
 

diff --git a/requirements.txt b/requirements.txt
@@ -1,6 +1,5 @@
-# Pinning ansible-compat version due to [bug](https://github.com/ansible-community/molecule/issues/3903)
-ansible-compat == 3.0.2
-molecule == 5.*
+ansible-compat == 4.*
+molecule == 6.*
 molecule-plugins[docker] == 23.*
 ansible-lint == 6.*
 paramiko == 3.*
diff --git a/tox.ini b/tox.ini
@@ -3,7 +3,10 @@
 #
 [tox]
 minversion = 4.2.4
-envlist = py3-ansible{6,7,8}
+# Ansible 6 and 7 are disabled, causing issues with Fedora:
+# https://github.com/ansible/ansible/issues/81199#event-9773321055
+# envlist = py3-ansible{6,7,8}
+envlist = py3-ansible{8}
 
 skipsdist = true
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,7 +4,7 @@ about: Suggest an idea for this project @@
     ---
-    ## Proposed feature
+    # Proposed feature
     A clear and concise description of what you want to happen.
@@ Expand Down @@