diff options
Diffstat (limited to 'ansible/roles/vncserver')
-rw-r--r-- | ansible/roles/vncserver/.yamllint | 1 | ||||
-rw-r--r-- | ansible/roles/vncserver/molecule/default/molecule.yml | 11 | ||||
-rw-r--r-- | ansible/roles/vncserver/molecule/ubuntu/molecule.yml | 11 |
3 files changed, 11 insertions, 12 deletions
diff --git a/ansible/roles/vncserver/.yamllint b/ansible/roles/vncserver/.yamllint index ad0be760..c5ae64be 100644 --- a/ansible/roles/vncserver/.yamllint +++ b/ansible/roles/vncserver/.yamllint @@ -1,3 +1,4 @@ +--- extends: default rules: diff --git a/ansible/roles/vncserver/molecule/default/molecule.yml b/ansible/roles/vncserver/molecule/default/molecule.yml index 5f7e4062..4486c00c 100644 --- a/ansible/roles/vncserver/molecule/default/molecule.yml +++ b/ansible/roles/vncserver/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} @@ -17,8 +20,6 @@ platforms: - infrastructure provisioner: name: ansible - lint: - name: ansible-lint env: ANSIBLE_ROLES_PATH: ../../../../test/roles inventory: @@ -26,7 +27,5 @@ provisioner: group_vars: ../../../../group_vars verifier: name: testinfra - lint: - name: flake8 options: v: 1 diff --git a/ansible/roles/vncserver/molecule/ubuntu/molecule.yml b/ansible/roles/vncserver/molecule/ubuntu/molecule.yml index d821cd73..38dbe7fd 100644 --- a/ansible/roles/vncserver/molecule/ubuntu/molecule.yml +++ b/ansible/roles/vncserver/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} @@ -17,8 +20,6 @@ platforms: - infrastructure provisioner: name: ansible - lint: - name: ansible-lint playbooks: prepare: ../default/prepare.yml converge: ../default/playbook.yml @@ -32,8 +33,6 @@ scenario: name: ubuntu verifier: name: testinfra - lint: - name: flake8 options: v: 1 directory: ../default/tests/ |