diff --git a/.ansible-lint b/.ansible-lint index 3f7f42d7305ee326e33307c0fa5563440f44d91d..980648144e0ca9280675586ceaa4a0c183179207 100644 --- a/.ansible-lint +++ b/.ansible-lint @@ -1,2 +1,7 @@ +exclude_paths: + - molecule/default/create.yml skip_list: - '602' + - '204' + - '208' + - '106' diff --git a/.flake8 b/.flake8 index 5384053b3bc5bbf41dac3f7dab8906d0959e747f..7a5c81ef412ec35c96bb1189140ab844ce2ad79f 100644 --- a/.flake8 +++ b/.flake8 @@ -1,2 +1,2 @@ [flake8] -ignore = E501,W503,E203 +ignore = E501,W503,E203,E402 diff --git a/.yamllint b/.yamllint index 3a2255e4656c4b4cf94ff9d60c2c4548246a2db0..8bb60ab5e335f057a608cb3cfc180bb83861b361 100644 --- a/.yamllint +++ b/.yamllint @@ -1,3 +1,4 @@ +--- extends: default rules: diff --git a/molecule/default/Dockerfile.j2 b/molecule/default/Dockerfile.j2 deleted file mode 100644 index 7b76a7cc46d56ea0d5fc818106be439f4ccc85cd..0000000000000000000000000000000000000000 --- a/molecule/default/Dockerfile.j2 +++ /dev/null @@ -1,14 +0,0 @@ -# Molecule managed - -{% if item.registry is defined %} -FROM {{ item.registry.url }}/{{ item.image }} -{% else %} -FROM {{ item.image }} -{% endif %} - -RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \ - elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install /usr/bin/python3 /usr/bin/python3-config /usr/bin/dnf-3 sudo bash iproute && dnf clean all; \ - elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl bash && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \ - elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml && zypper clean -a; \ - elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates; \ - elif [ $(command -v xbps-install) ]; then xbps-install -Syu && xbps-install -y python sudo bash ca-certificates && xbps-remove -O; fi diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml index 5276ce29d0ca357cb0a33ae7dfd02ae042e91e12..bcb9304de8e4912c6e1944eec1f4face98ca4a43 100644 --- a/molecule/default/molecule.yml +++ b/molecule/default/molecule.yml @@ -3,15 +3,16 @@ dependency: name: galaxy options: role-file: roles/requirements.yml -lint: - name: yamllint +lint: | + set -e + yamllint . + ansible-lint + flake8 provisioner: name: ansible config_options: defaults: gather_timeout: 20 - lint: - name: ansible-lint playbooks: converge: ../../playbook.yml inventory: @@ -22,8 +23,6 @@ scenario: name: default verifier: name: testinfra - lint: - name: flake8 driver: name: docker platforms: