Skip to content

Commit

Permalink
Updated action and container, newer components.
Browse files Browse the repository at this point in the history
  • Loading branch information
robert-de-bock committed Nov 11, 2023
1 parent 55ccb56 commit 2c92a0b
Show file tree
Hide file tree
Showing 8 changed files with 28 additions and 22 deletions.
3 changes: 1 addition & 2 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff 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
14 changes: 8 additions & 6 deletions .github/workflows/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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/[email protected].0
uses: robertdebock/[email protected].1
with:
image: ${{ matrix.config.image }}
tag: ${{ matrix.config.tag }}
6 changes: 4 additions & 2 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
image: "robertdebock/github-action-molecule:6.0.0"
image: "robertdebock/github-action-molecule:6.0.1"

variables:
PY_COLORS: 1
Expand All @@ -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"
Expand Down
3 changes: 2 additions & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# [tomcat](#tomcat)
# Ansible role [tomcat](#tomcat)

Install and configure tomcat on your system.

Expand Down Expand Up @@ -228,11 +228,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:
Expand Down
5 changes: 2 additions & 3 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -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.*
5 changes: 4 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 2c92a0b

Please sign in to comment.