4 files changed, 16 insertions, 18 deletions
diff --git a/ansible/roles/helm/.yamllint b/ansible/roles/helm/.yamllint
index ad0be760..c5ae64be 100644
--- a/ansible/roles/helm/.yamllint
+++ b/ansible/roles/helm/.yamllint
@@ -1,3 +1,4 @@
+---
 extends: default
 
 rules:
diff --git a/ansible/roles/helm/molecule/default/molecule.yml b/ansible/roles/helm/molecule/default/molecule.yml
index 359d3aba..b20e2a1e 100644
--- a/ansible/roles/helm/molecule/default/molecule.yml
+++ b/ansible/roles/helm/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: centos:7
@@ -12,8 +15,6 @@ platforms:
       - infrastructure
 provisioner:
   name: ansible
-  lint:
-    name: ansible-lint
   env:
     ANSIBLE_ROLES_PATH: ../../../../test/roles
     ANSIBLE_LIBRARY: ../../../../library
@@ -26,5 +27,3 @@ scenario:
   name: default
 verifier:
   name: testinfra
-  lint:
-    name: flake8
diff --git a/ansible/roles/helm/molecule/helm3/molecule.yml b/ansible/roles/helm/molecule/helm3/molecule.yml
index e8634477..4b582f5c 100644
--- a/ansible/roles/helm/molecule/helm3/molecule.yml
+++ b/ansible/roles/helm/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-helm3
     image: centos:7
@@ -12,8 +15,6 @@ platforms:
       - infrastructure
 provisioner:
   name: ansible
-  lint:
-    name: ansible-lint
   env:
     ANSIBLE_ROLES_PATH: ../../../../test/roles
     ANSIBLE_LIBRARY: ../../../../library
@@ -26,6 +27,4 @@ scenario:
   name: helm3
 verifier:
   name: testinfra
-  lint:
-    name: flake8
   directory: ../default/tests
diff --git a/ansible/roles/helm/molecule/ubuntu/molecule.yml b/ansible/roles/helm/molecule/ubuntu/molecule.yml
index a43ff074..9a972881 100644
--- a/ansible/roles/helm/molecule/ubuntu/molecule.yml
+++ b/ansible/roles/helm/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: ubuntu:18.04
@@ -12,8 +15,6 @@ platforms:
       - infrastructure
 provisioner:
   name: ansible
-  lint:
-    name: ansible-lint
   env:
     ANSIBLE_ROLES_PATH: ../../../../test/roles
     ANSIBLE_LIBRARY: ../../../../library
@@ -29,6 +30,4 @@ scenario:
   name: ubuntu
 verifier:
   name: testinfra
-  lint:
-    name: flake8
   directory: ../default/tests