Skip to content

Commit f43f920

Browse files
Updated action and container, newer components.
1 parent a756782 commit f43f920

File tree

8 files changed

+28
-22
lines changed

8 files changed

+28
-22
lines changed

Diff for: .github/ISSUE_TEMPLATE/bug_report.md

+1-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ about: Create a report to help me improve
44

55
---
66

7-
## Describe the bug
7+
# Describe the bug
88

99
A clear and concise description of what the bug is.
1010

@@ -13,7 +13,6 @@ A clear and concise description of what the bug is.
1313
Please paste the playbook you are using. (Consider `requirements.yml` and
1414
optionally the command you've invoked.)
1515

16-
1716
```yaml
1817
---
1918
YOUR PLAYBOOK HERE

Diff for: .github/ISSUE_TEMPLATE/feature_request.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ about: Suggest an idea for this project
44

55
---
66

7-
## Proposed feature
7+
# Proposed feature
88

99
A clear and concise description of what you want to happen.
1010

Diff for: .github/workflows/molecule.yml

+8-6
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,11 @@ jobs:
4040
- image: "debian"
4141
tag: "bullseye"
4242
- image: "fedora"
43-
tag: "37"
43+
tag: "38"
4444
- image: "fedora"
4545
tag: "latest"
46+
- image: "fedora"
47+
tag: "rawhide"
4648
- image: "ubuntu"
4749
tag: "latest"
4850
- image: "ubuntu"
@@ -54,12 +56,12 @@ jobs:
5456
uses: actions/checkout@v3
5557
with:
5658
path: "${{ github.repository }}"
57-
- name: disable apparmor for mysql
58-
run: sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
59-
- name: parse apparmor for mysql
60-
run: sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
59+
# - name: disable apparmor for mysql
60+
# run: sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
61+
# - name: parse apparmor for mysql
62+
# run: sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
6163
- name: molecule
62-
uses: robertdebock/[email protected].0
64+
uses: robertdebock/[email protected].1
6365
with:
6466
image: ${{ matrix.config.image }}
6567
tag: ${{ matrix.config.tag }}

Diff for: .gitlab-ci.yml

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
image: "robertdebock/github-action-molecule:6.0.0"
2+
image: "robertdebock/github-action-molecule:6.0.1"
33

44
variables:
55
PY_COLORS: 1
@@ -23,9 +23,11 @@ molecule:
2323
- image: "debian"
2424
tag: "bullseye"
2525
- image: "fedora"
26-
tag: "37"
26+
tag: "38"
2727
- image: "fedora"
2828
tag: "latest"
29+
- image: "fedora"
30+
tag: "rawhide"
2931
- image: "ubuntu"
3032
tag: "latest"
3133
- image: "ubuntu"

Diff for: .pre-commit-config.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ repos:
1111
rev: v1.32.0
1212
hooks:
1313
- id: yamllint
14-
args: [-c=.yamllint]
14+
args:
15+
- -c=.yamllint
1516

1617
- repo: https://github.com/robertdebock/pre-commit
1718
rev: v1.5.2

Diff for: README.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# [dhcpd](#dhcpd)
1+
# Ansible role [dhcpd](#dhcpd)
22

33
Install and configure dhcpd on your system.
44

@@ -105,11 +105,11 @@ This role has been tested on these [container images](https://hub.docker.com/u/r
105105

106106
|container|tags|
107107
|---------|----|
108-
|[Alpine](https://hub.docker.com/repository/docker/robertdebock/alpine/general)|all|
109-
|[EL](https://hub.docker.com/repository/docker/robertdebock/enterpriselinux/general)|8, 9|
110-
|[Debian](https://hub.docker.com/repository/docker/robertdebock/debian/general)|all|
111-
|[Fedora](https://hub.docker.com/repository/docker/robertdebock/fedora/general)|all|
112-
|[Ubuntu](https://hub.docker.com/repository/docker/robertdebock/ubuntu/general)|all|
108+
|[Alpine](https://hub.docker.com/r/robertdebock/alpine)|all|
109+
|[EL](https://hub.docker.com/r/robertdebock/enterpriselinux)|8, 9|
110+
|[Debian](https://hub.docker.com/r/robertdebock/debian)|all|
111+
|[Fedora](https://hub.docker.com/r/robertdebock/fedora/)|all|
112+
|[Ubuntu](https://hub.docker.com/r/robertdebock/ubuntu)|all|
113113

114114
The minimum version of Ansible required is 2.12, tests have been done to:
115115

Diff for: requirements.txt

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
# Pinning ansible-compat version due to [bug](https://github.com/ansible-community/molecule/issues/3903)
2-
ansible-compat == 3.0.2
3-
molecule == 5.*
1+
ansible-compat == 4.*
2+
molecule == 6.*
43
molecule-plugins[docker] == 23.*
54
ansible-lint == 6.*
65
paramiko == 3.*

Diff for: tox.ini

+4-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@
33
#
44
[tox]
55
minversion = 4.2.4
6-
envlist = py3-ansible{6,7,8}
6+
# Ansible 6 and 7 are disabled, causing issues with Fedora:
7+
# https://github.com/ansible/ansible/issues/81199#event-9773321055
8+
# envlist = py3-ansible{6,7,8}
9+
envlist = py3-ansible{8}
710

811
skipsdist = true
912

0 commit comments

Comments
 (0)