Switch to Ansible 4 and 5, drop ansible-later, update action version.

This commit is contained in:
Robert de Bock 2022-01-26 12:55:01 +01:00
parent 721dd1e0e9
commit d0369ddaf9
5 changed files with 6 additions and 22 deletions

View File

@ -1,12 +0,0 @@
---
rules:
version: "0.2"
exclude_files:
- meta/argument_specs.yml
- meta/exception.yml
- meta/preferences.yml
- meta/version.yml
- requirements.txt
exclude_filter:
- LINT0009
- ANSIBLE0007

View File

@ -147,8 +147,6 @@
dest: .github/FUNDING.yml dest: .github/FUNDING.yml
- source: pre-commit-config.yaml - source: pre-commit-config.yaml
dest: .pre-commit-config.yaml dest: .pre-commit-config.yaml
- source: later.yml
dest: .later.yml
loop_control: loop_control:
label: "{{ item.source }}" label: "{{ item.source }}"

View File

@ -21,7 +21,7 @@ jobs:
path: {% raw %}"${{ github.repository }}"{% endraw %} path: {% raw %}"${{ github.repository }}"{% endraw %}
- name: molecule - name: molecule
uses: robertdebock/molecule-action@4.0.5 uses: robertdebock/molecule-action@4.0.6
with: with:
command: lint command: lint
test: test:
@ -51,7 +51,7 @@ jobs:
- name: parse apparmor for mysql - name: parse apparmor for mysql
run: sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld run: sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
- name: molecule - name: molecule
uses: robertdebock/molecule-action@4.0.5 uses: robertdebock/molecule-action@4.0.6
with: with:
image: {% raw %}${{ matrix.config.image }}{% endraw %} image: {% raw %}${{ matrix.config.image }}{% endraw %}

View File

@ -9,7 +9,6 @@ lint: |
set -e set -e
yamllint . yamllint .
ansible-lint ansible-lint
ansible-later
driver: driver:
name: docker name: docker
platforms: platforms:

View File

@ -4,18 +4,17 @@ minversion = 3.21.4
{% if tox_versions is defined %} {% if tox_versions is defined %}
envlist = py{310}-ansible-{% raw %}{{% endraw %}{% for version in tox_versions %}{{ version }}{% if not loop.last %},{% endif %}{% endfor %}{% raw %}}{% endraw %} envlist = py{310}-ansible-{% raw %}{{% endraw %}{% for version in tox_versions %}{{ version }}{% if not loop.last %},{% endif %}{% endfor %}{% raw %}}{% endraw %}
{% else %} {% else %}
envlist = py{310}-ansible-{2.10,2.11,2.12} envlist = py{310}-ansible-{4,5}
{% endif %} {% endif %}
skipsdist = true skipsdist = true
[testenv] [testenv]
deps = deps =
2.10: ansible-base == 2.10.* 4: ansible == 4.*
2.11: ansible-core == 2.11.* 5: ansible == 5.*
2.12: ansible-core == 2.12.*
molecule[docker] molecule[docker]
docker == 4.* docker == 5.*
ansible-lint == 5.* ansible-lint == 5.*
commands = molecule test commands = molecule test
setenv = setenv =