summaryrefslogtreecommitdiffstats
path: root/ansible/roles/setup
diff options
context:
space:
mode:
authorBartek Grzybowski <b.grzybowski@partner.samsung.com>2021-04-08 16:20:24 +0200
committerBartek Grzybowski <b.grzybowski@partner.samsung.com>2021-04-08 16:20:24 +0200
commit018a6abd19c5eb32d6073c53be3a995f5fb83ed4 (patch)
tree70038def67b51a8db7ba9c8ba95707be22e06265 /ansible/roles/setup
parentcecf6cf2aa21080105876fdcf93b26f434fb9eb4 (diff)
[MOLECULE 3.3.0] Upgrade linters Molecule setup
In 3.x.x version family of Molecule the syntax for linters invocation has been changed. Ref.: https://molecule.readthedocs.io/en/latest/configuration.html#lint Change-Id: I82d1fd996eb5853953ea6bc74dcbb88a485a2084 Issue-ID: OOM-2722 Signed-off-by: Bartek Grzybowski <b.grzybowski@partner.samsung.com>
Diffstat (limited to 'ansible/roles/setup')
-rw-r--r--ansible/roles/setup/.yamllint1
-rw-r--r--ansible/roles/setup/molecule/default/molecule.yml11
-rw-r--r--ansible/roles/setup/molecule/ubuntu/molecule.yml11
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/