Skip to content

Commit 16fcc43

Browse files
committed
Upgrade ansible-lint and dependencies
1 parent ab3771a commit 16fcc43

File tree

6 files changed

+21
-13
lines changed

6 files changed

+21
-13
lines changed

.github/workflows/tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ jobs:
1111
strategy:
1212
fail-fast: false
1313
matrix:
14-
python-version: [3.8, 3.9]
15-
ansible-version: ['4', '5']
14+
python-version: ['3.8', '3.9', '3.10']
15+
ansible-version: ['5', '6']
1616

1717
steps:
1818
- uses: actions/checkout@v3

README.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,12 @@ None.
5656

5757
## Changelog
5858

59+
### 4.3.0
60+
61+
* drop support for ansible older than 5.0
62+
* add test for Debian `bullseye`
63+
64+
5965
### 4.2.0
6066

6167
* moved CI to Github Actions

meta/main.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,12 @@ galaxy_info:
88

99
license: MIT
1010

11-
min_ansible_version: 2.8
11+
min_ansible_version: "5.0"
1212

1313
platforms:
1414
- name: Debian
1515
versions:
16+
- bullseye
1617
- buster
1718
- jessie
1819
- stretch

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
molecule==4.0.1
2-
ansible-lint==5.4.0
2+
ansible-lint==6.8.2
33
molecule-docker==2.1.0
44
docker==6.0.0
55
pytest-testinfra==6.8.0

tasks/main.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
---
22
# tasks file for rpi_boot_config
3-
- name: "adjust {{ rpi_boot_config_file }} based on boot_config"
4-
lineinfile:
3+
- name: "Adjust {{ rpi_boot_config_file }}"
4+
ansible.builtin.lineinfile:
55
line: '{{ item.key }}={{ item.value }}'
66
dest: "{{ rpi_boot_config_file }}"
77
regexp: "^{{ item.key }}="
88
with_dict: '{{ boot_config }}'
99
register: _boot_config
1010

11-
- name: "adjust {{ rpi_boot_config_file }} based on boot_config_lines"
12-
lineinfile:
11+
- name: "Adjust {{ rpi_boot_config_file }}"
12+
ansible.builtin.lineinfile:
1313
line: '{{ item }}'
1414
dest: "{{ rpi_boot_config_file }}"
1515
regexp: "^{{ item }}"
1616
with_items: '{{ boot_config_lines }}'
1717
register: _boot_config_lines
1818

19-
- name: "restart machine" # noqa 503
20-
reboot:
19+
- name: "Restart machine" # noqa 503
20+
ansible.builtin.reboot:
2121
msg: "Reboot by Ansible, because {{ rpi_boot_config_file }} config changed."
2222
reboot_timeout: 300 # (= 5 minutes)
2323
when: _boot_config.changed or _boot_config_lines.changed

tox.ini

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
[tox]
22
minversion = 1.8
3-
envlist = py{38,39}-ansible{4,5}
3+
envlist = py{38,39,310}-ansible{5,6}
44
skipsdist = true
55

66
[testenv]
77
passenv = *
88
deps =
99
-rrequirements.txt
10-
ansible4: ansible>=4.0,<5.0
1110
ansible5: ansible>=5.0,<6.0
11+
ansible6: ansible>=6.0,<7.0
1212
commands =
1313
pip list
1414
molecule --version
@@ -20,7 +20,8 @@ commands =
2020
python =
2121
3.8: py38
2222
3.9: py39
23+
3.10: py310
2324
[gh-actions:env]
2425
ANSIBLE =
25-
4: ansible4
2626
5: ansible5
27+
6: ansible6

0 commit comments

Comments
 (0)