diff options
Diffstat (limited to 'ansible/roles/docker/molecule')
| -rw-r--r-- | ansible/roles/docker/molecule/default/molecule.yml | 11 | ||||
| -rw-r--r-- | ansible/roles/docker/molecule/ubuntu/molecule.yml | 11 |
2 files changed, 10 insertions, 12 deletions
diff --git a/ansible/roles/docker/molecule/default/molecule.yml b/ansible/roles/docker/molecule/default/molecule.yml index efa7f0ae..031aa5fc 100644 --- a/ansible/roles/docker/molecule/default/molecule.yml +++ b/ansible/roles/docker/molecule/default/molecule.yml @@ -3,8 +3,11 @@ dependency: name: galaxy driver: name: docker -lint: - name: yamllint +lint: | + set -e + yamllint . + ansible-lint . + flake8 platforms: - name: infrastructure-server image: molecule-${PREBUILD_PLATFORM_DISTRO:-centos}:${PREBUILD_DISTRO_VERSION:-centos7.6} @@ -20,8 +23,6 @@ platforms: - /var/lib/docker provisioner: name: ansible - lint: - name: ansible-lint env: ANSIBLE_ROLES_PATH: ../../../../test/roles ANSIBLE_LIBRARY: ../../../../library @@ -35,7 +36,5 @@ verifier: name: testinfra options: verbose: true - lint: - name: flake8 options: ignore: W291 # trailing whitespace diff --git a/ansible/roles/docker/molecule/ubuntu/molecule.yml b/ansible/roles/docker/molecule/ubuntu/molecule.yml index 8325ffb3..751782af 100644 --- a/ansible/roles/docker/molecule/ubuntu/molecule.yml +++ b/ansible/roles/docker/molecule/ubuntu/molecule.yml @@ -3,8 +3,11 @@ dependency: name: galaxy driver: name: docker -lint: - name: yamllint +lint: | + set -e + yamllint . + ansible-lint . + flake8 platforms: - name: infrastructure-server image: molecule-${PREBUILD_PLATFORM_DISTRO:-ubuntu}:${PREBUILD_DISTRO_VERSION:-18.04} @@ -20,8 +23,6 @@ platforms: - /var/lib/docker provisioner: name: ansible - lint: - name: ansible-lint playbooks: prepare: ../default/prepare.yml converge: ../default/playbook.yml @@ -39,8 +40,6 @@ verifier: name: testinfra options: verbose: true - lint: - name: flake8 options: ignore: W291 # trailing whitespace directory: ../default/tests/ |