diff options
Diffstat (limited to 'ansible/roles/setup')
| -rw-r--r-- | ansible/roles/setup/.yamllint | 1 | ||||
| -rw-r--r-- | ansible/roles/setup/molecule/default/molecule.yml | 11 | ||||
| -rw-r--r-- | ansible/roles/setup/molecule/ubuntu/molecule.yml | 11 |
3 files changed, 11 insertions, 12 deletions
diff --git a/ansible/roles/setup/.yamllint b/ansible/roles/setup/.yamllint index 3a2255e4..8bb60ab5 100644 --- a/ansible/roles/setup/.yamllint +++ b/ansible/roles/setup/.yamllint @@ -1,3 +1,4 @@ +--- extends: default rules: diff --git a/ansible/roles/setup/molecule/default/molecule.yml b/ansible/roles/setup/molecule/default/molecule.yml index 1e9a4c19..82ab123a 100644 --- a/ansible/roles/setup/molecule/default/molecule.yml +++ b/ansible/roles/setup/molecule/default/molecule.yml @@ -3,18 +3,17 @@ dependency: name: galaxy driver: name: docker -lint: - name: yamllint +lint: | + set -e + yamllint . + ansible-lint . + flake8 platforms: - name: instance image: ${PLATFORM_DISTRO:-centos}:${DISTRO_VERSION:-7} provisioner: name: ansible - lint: - name: ansible-lint scenario: name: default verifier: name: testinfra - lint: - name: flake8 diff --git a/ansible/roles/setup/molecule/ubuntu/molecule.yml b/ansible/roles/setup/molecule/ubuntu/molecule.yml index 16dcedf7..d0cce594 100644 --- a/ansible/roles/setup/molecule/ubuntu/molecule.yml +++ b/ansible/roles/setup/molecule/ubuntu/molecule.yml @@ -3,22 +3,21 @@ dependency: name: galaxy driver: name: docker -lint: - name: yamllint +lint: | + set -e + yamllint . + ansible-lint . + flake8 platforms: - name: instance image: ${PLATFORM_DISTRO:-ubuntu}:${DISTRO_VERSION:-18.04} dockerfile: ../default/Dockerfile.j2 provisioner: name: ansible - lint: - name: ansible-lint playbooks: converge: ../default/playbook.yml scenario: name: ubuntu verifier: name: testinfra - lint: - name: flake8 directory: ../default/tests/ |