From 04324f8763cb9c1b17569f8c21bc7b549f648611 Mon Sep 17 00:00:00 2001 From: Robert de Bock Date: Sat, 11 Nov 2023 10:03:37 +0100 Subject: [PATCH] Updated action and container, newer components. --- .github/ISSUE_TEMPLATE/bug_report.md | 3 +-- .github/ISSUE_TEMPLATE/feature_request.md | 2 +- .github/workflows/molecule.yml | 14 ++++++++------ .gitlab-ci.yml | 6 ++++-- .pre-commit-config.yaml | 3 ++- README.md | 12 ++++++------ requirements.txt | 5 ++--- tox.ini | 5 ++++- 8 files changed, 28 insertions(+), 22 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 4bb9d98..2fee24a 100644 --- 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 index 55a93c4..929e87a 100644 --- 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 index 2a30163..24f1fed 100644 --- a/.github/workflows/molecule.yml +++ b/.github/workflows/molecule.yml @@ -38,9 +38,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" @@ -54,12 +56,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/molecule-action@6.0.0 + uses: robertdebock/molecule-action@6.0.1 with: image: ${{ matrix.config.image }} tag: ${{ matrix.config.tag }} diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b2f58f9..1fbe1d4 100644 --- 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 @@ -21,9 +21,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 index f889d1d..547e418 100644 --- 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 index 479d0fd..b516bee 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# [httpd](#httpd) +# Ansible role [httpd](#httpd) Install and configure httpd on your system. @@ -171,11 +171,11 @@ This role has been tested on these [container images](https://hub.docker.com/u/r |container|tags| |---------|----| -|[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| +|[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 index dba7154..65b52f4 100644 --- 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 index 699c9eb..52387a8 100644 --- 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