diff options
Diffstat (limited to 'ansible/roles/nginx')
-rw-r--r-- | ansible/roles/nginx/.yamllint | 1 | ||||
-rw-r--r-- | ansible/roles/nginx/molecule/default/molecule.yml | 11 | ||||
-rw-r--r-- | ansible/roles/nginx/molecule/ubuntu/molecule.yml | 11 |
3 files changed, 11 insertions, 12 deletions
diff --git a/ansible/roles/nginx/.yamllint b/ansible/roles/nginx/.yamllint index ad0be760..c5ae64be 100644 --- a/ansible/roles/nginx/.yamllint +++ b/ansible/roles/nginx/.yamllint @@ -1,3 +1,4 @@ +--- extends: default rules: diff --git a/ansible/roles/nginx/molecule/default/molecule.yml b/ansible/roles/nginx/molecule/default/molecule.yml index 63c47724..c5145611 100644 --- a/ansible/roles/nginx/molecule/default/molecule.yml +++ b/ansible/roles/nginx/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} @@ -22,9 +25,5 @@ provisioner: inventory: links: group_vars: ../../../../group_vars - lint: - name: ansible-lint verifier: name: testinfra - lint: - name: flake8 diff --git a/ansible/roles/nginx/molecule/ubuntu/molecule.yml b/ansible/roles/nginx/molecule/ubuntu/molecule.yml index 9955e7d5..d882633a 100644 --- a/ansible/roles/nginx/molecule/ubuntu/molecule.yml +++ b/ansible/roles/nginx/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} @@ -22,8 +25,6 @@ provisioner: inventory: links: group_vars: ../../../../group_vars - lint: - name: ansible-lint playbooks: prepare: ../default/prepare.yml converge: ../default/playbook.yml @@ -32,5 +33,3 @@ scenario: name: ubuntu verifier: name: testinfra - lint: - name: flake8 |