diff options
Diffstat (limited to 'ansible/test')
-rw-r--r-- | ansible/test/play-infrastructure/.yamllint | 1 | ||||
-rw-r--r-- | ansible/test/play-infrastructure/molecule/default/molecule.yml | 11 | ||||
-rw-r--r-- | ansible/test/play-resources/.yamllint | 1 | ||||
-rw-r--r-- | ansible/test/play-resources/molecule/default/molecule.yml | 11 | ||||
-rw-r--r-- | ansible/test/play-resources/molecule/nfs/molecule.yml | 11 | ||||
-rw-r--r-- | ansible/test/play-rke/.yamllint | 1 | ||||
-rw-r--r-- | ansible/test/play-rke/molecule/default/molecule.yml | 11 | ||||
-rw-r--r-- | ansible/test/play-rke/molecule/helm3/molecule.yml | 11 |
8 files changed, 28 insertions, 30 deletions
diff --git a/ansible/test/play-infrastructure/.yamllint b/ansible/test/play-infrastructure/.yamllint index ad0be760..c5ae64be 100644 --- a/ansible/test/play-infrastructure/.yamllint +++ b/ansible/test/play-infrastructure/.yamllint @@ -1,3 +1,4 @@ +--- extends: default rules: diff --git a/ansible/test/play-infrastructure/molecule/default/molecule.yml b/ansible/test/play-infrastructure/molecule/default/molecule.yml index c4b7901a..1098dc80 100644 --- a/ansible/test/play-infrastructure/molecule/default/molecule.yml +++ b/ansible/test/play-infrastructure/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} @@ -43,8 +46,6 @@ provisioner: inventory: links: group_vars: ../../../../group_vars - lint: - name: ansible-lint scenario: name: default test_sequence: @@ -67,5 +68,3 @@ scenario: - destroy verifier: name: testinfra - lint: - name: flake8 diff --git a/ansible/test/play-resources/.yamllint b/ansible/test/play-resources/.yamllint index ad0be760..c5ae64be 100644 --- a/ansible/test/play-resources/.yamllint +++ b/ansible/test/play-resources/.yamllint @@ -1,3 +1,4 @@ +--- extends: default rules: diff --git a/ansible/test/play-resources/molecule/default/molecule.yml b/ansible/test/play-resources/molecule/default/molecule.yml index 9ac1aaca..5c7dbd54 100644 --- a/ansible/test/play-resources/molecule/default/molecule.yml +++ b/ansible/test/play-resources/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: resource-host image: molecule-${PREBUILD_PLATFORM_DISTRO:-centos}:${PREBUILD_DISTRO_VERSION:-centos7.6} @@ -33,9 +36,5 @@ provisioner: name: ansible env: ANSIBLE_ROLES_PATH: ../../../../roles:../../../roles - lint: - name: ansible-lint verifier: name: testinfra - lint: - name: flake8 diff --git a/ansible/test/play-resources/molecule/nfs/molecule.yml b/ansible/test/play-resources/molecule/nfs/molecule.yml index 11726396..25a14065 100644 --- a/ansible/test/play-resources/molecule/nfs/molecule.yml +++ b/ansible/test/play-resources/molecule/nfs/molecule.yml @@ -3,8 +3,11 @@ dependency: name: galaxy driver: name: docker -lint: - name: yamllint +lint: | + set -e + yamllint . + ansible-lint . + flake8 platforms: - name: resource-host image: molecule-${PREBUILD_PLATFORM_DISTRO:-centos}:${PREBUILD_DISTRO_VERSION:-centos7.6} @@ -34,9 +37,5 @@ provisioner: name: ansible env: ANSIBLE_ROLES_PATH: ../../../../roles:../../../roles - lint: - name: ansible-lint verifier: name: testinfra - lint: - name: flake8 diff --git a/ansible/test/play-rke/.yamllint b/ansible/test/play-rke/.yamllint index ad0be760..c5ae64be 100644 --- a/ansible/test/play-rke/.yamllint +++ b/ansible/test/play-rke/.yamllint @@ -1,3 +1,4 @@ +--- extends: default rules: diff --git a/ansible/test/play-rke/molecule/default/molecule.yml b/ansible/test/play-rke/molecule/default/molecule.yml index 519679a5..af861144 100644 --- a/ansible/test/play-rke/molecule/default/molecule.yml +++ b/ansible/test/play-rke/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} @@ -29,11 +32,7 @@ provisioner: env: ANSIBLE_ROLES_PATH: ../../../../test/roles ANSIBLE_LIBRARY: ../../../../library - lint: - name: ansible-lint scenario: name: default verifier: name: testinfra - lint: - name: flake8 diff --git a/ansible/test/play-rke/molecule/helm3/molecule.yml b/ansible/test/play-rke/molecule/helm3/molecule.yml index 83a2fd20..e76da046 100644 --- a/ansible/test/play-rke/molecule/helm3/molecule.yml +++ b/ansible/test/play-rke/molecule/helm3/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} @@ -29,11 +32,7 @@ provisioner: env: ANSIBLE_ROLES_PATH: ../../../../test/roles ANSIBLE_LIBRARY: ../../../../library - lint: - name: ansible-lint scenario: name: helm3 verifier: name: testinfra - lint: - name: flake8 |