diff --git a/.yamllint b/.yamllint index 7626c6e..894450c 100644 --- a/.yamllint +++ b/.yamllint @@ -9,9 +9,7 @@ rules: max-spaces-inside: 1 level: error line-length: disable - # NOTE(retr0h): Templates no longer fail this lint rule. - # Uncomment if running old Molecule templates. - # truthy: disable + truthy: disable ignore: | .tox/ diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml index 6329307..ece185b 100644 --- a/molecule/default/molecule.yml +++ b/molecule/default/molecule.yml @@ -3,10 +3,6 @@ dependency: name: galaxy driver: name: docker -lint: | - set -e - yamllint . - ansible-lint tasks/*.yml platforms: - name: centos7 image: centos:7 @@ -16,6 +12,8 @@ platforms: image: ubuntu:18.04 - name: ubuntu2004 image: ubuntu:20.04 + - name: ubuntu2204 + image: ubuntu:22.04 provisioner: name: ansible scenario: diff --git a/tasks/main.yml b/tasks/main.yml index ce1cf63..c5012f2 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -1,13 +1,14 @@ --- - name: Fetch ShellCheck - get_url: + ansible.builtin.get_url: url: 'https://github.com/koalaman/shellcheck/releases/download/{{ shellcheck_version }}/shellcheck-{{ shellcheck_version }}.linux.x86_64.tar.xz' dest: /tmp/shellcheck.tar.xz checksum: '{{ shellcheck_checksum }}' + mode: 0644 become: true - name: Unpack ShellCheck - unarchive: + ansible.builtin.unarchive: src: /tmp/shellcheck.tar.xz dest: /tmp list_files: true @@ -15,7 +16,7 @@ become: true - name: Install ShellCheck to /usr/local/bin/shellcheck - copy: + ansible.builtin.copy: src: '/tmp/shellcheck-{{ shellcheck_version }}/shellcheck' dest: /usr/local/bin/shellcheck mode: 0755 diff --git a/tox.ini b/tox.ini index 2ec4a50..5ad109a 100644 --- a/tox.ini +++ b/tox.ini @@ -2,20 +2,17 @@ minversion = 1.6 envlist = molecule, - pre-commit + pre-commit, + lint skipsdist=true [testenv:molecule] basepython = python3 deps = - ansible~=2.9.6 - ansible-lint~=4.2.0 + ansible docker molecule - yamllint - molecule~=3.0.8 - molecule[docker] - pytest~=5.4.0 + molecule-docker passenv = * commands = ./molecule.sh @@ -23,9 +20,10 @@ allowlist_externals = ./molecule.sh [testenv:pre-commit] -basepython = python3 +allowlist_externals = + /bin/sh deps = pre-commit -allowlist_externals = /bin/sh +passenv = HOME commands = pre-commit run --all-files --show-diff-on-failure /bin/sh -c 'if ! git config --get user.name > /dev/null; then \ @@ -45,3 +43,15 @@ commands = /bin/sh -c "if [ -f .git/REMOVE_USEREMAIL ]; then \ git config --global --unset user.email; \ rm -f .git/REMOVE_USEREMAIL; fi" + +[testenv:lint] +basepython = python310 +deps = + ansible-lint + yamllint +commands = + /bin/bash -c "ansible-lint tasks/*.yml" + yamllint . +allowlist_externals = + /bin/bash + yamllint