summaryrefslogtreecommitdiffstats
path: root/ansible/roles/dns
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-22 08:49:23 +0200
commit481040facee44e617cc5a238b417a18dac7de262 (patch)
tree22b5890dd66852de18805c59c963030d97d608e9 /ansible/roles/dns
parentfc5d025754a26bc3102b6f90ed02d2edac86dd62 (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/dns')
-rw-r--r--ansible/roles/dns/.yamllint1
-rw-r--r--ansible/roles/dns/molecule/default/molecule.yml11
-rw-r--r--ansible/roles/dns/molecule/ubuntu/molecule.yml11
3 files changed, 11 insertions, 12 deletions
diff --git a/ansible/roles/dns/.yamllint b/ansible/roles/dns/.yamllint
index ad0be760..c5ae64be 100644
--- a/ansible/roles/dns/.yamllint
+++ b/ansible/roles/dns/.yamllint
@@ -1,3 +1,4 @@
+---
extends: default
rules:
diff --git a/ansible/roles/dns/molecule/default/molecule.yml b/ansible/roles/dns/molecule/default/molecule.yml
index 00c63ca9..a2d2c204 100644
--- a/ansible/roles/dns/molecule/default/molecule.yml
+++ b/ansible/roles/dns/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:
- /var/lib/docker
provisioner:
name: ansible
- lint:
- name: ansible-lint
env:
ANSIBLE_ROLES_PATH: ../../../../test/roles
ANSIBLE_LIBRARY: ../../../../library
@@ -32,5 +33,3 @@ provisioner:
app_data_path: "/opt/{{ app_name }}"
verifier:
name: testinfra
- lint:
- name: flake8
diff --git a/ansible/roles/dns/molecule/ubuntu/molecule.yml b/ansible/roles/dns/molecule/ubuntu/molecule.yml
index 5428c04a..5621b733 100644
--- a/ansible/roles/dns/molecule/ubuntu/molecule.yml
+++ b/ansible/roles/dns/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:
- /var/lib/docker
provisioner:
name: ansible
- lint:
- name: ansible-lint
env:
ANSIBLE_ROLES_PATH: ../../../../test/roles
ANSIBLE_LIBRARY: ../../../../library
@@ -38,5 +39,3 @@ scenario:
name: ubuntu
verifier:
name: testinfra
- lint:
- name: flake8