summaryrefslogtreecommitdiffstats
path: root/ansible/roles/chartmuseum
diff options
context:
space:
mode:
Diffstat (limited to 'ansible/roles/chartmuseum')
-rw-r--r--ansible/roles/chartmuseum/.yamllint1
-rw-r--r--ansible/roles/chartmuseum/molecule/default/molecule.yml11
-rw-r--r--ansible/roles/chartmuseum/molecule/ubuntu/molecule.yml11
3 files changed, 11 insertions, 12 deletions
diff --git a/ansible/roles/chartmuseum/.yamllint b/ansible/roles/chartmuseum/.yamllint
index ad0be760..c5ae64be 100644
--- a/ansible/roles/chartmuseum/.yamllint
+++ b/ansible/roles/chartmuseum/.yamllint
@@ -1,3 +1,4 @@
+---
extends: default
rules:
diff --git a/ansible/roles/chartmuseum/molecule/default/molecule.yml b/ansible/roles/chartmuseum/molecule/default/molecule.yml
index 9c5d1c2a..5c9dce79 100644
--- a/ansible/roles/chartmuseum/molecule/default/molecule.yml
+++ b/ansible/roles/chartmuseum/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: instance-chartmuseum
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
ANSIBLE_LIBRARY: ../../../../library
@@ -29,5 +30,3 @@ scenario:
name: default
verifier:
name: testinfra
- lint:
- name: flake8
diff --git a/ansible/roles/chartmuseum/molecule/ubuntu/molecule.yml b/ansible/roles/chartmuseum/molecule/ubuntu/molecule.yml
index 5f351a93..307988ad 100644
--- a/ansible/roles/chartmuseum/molecule/ubuntu/molecule.yml
+++ b/ansible/roles/chartmuseum/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: instance-ubuntu-chartmuseum
image: molecule-${PREBUILD_PLATFORM_DISTRO:-ubuntu}:${PREBUILD_DISTRO_VERSION:-18.04}
@@ -17,8 +20,6 @@ platforms:
- infrastructure
provisioner:
name: ansible
- lint:
- name: ansible-lint
env:
ANSIBLE_ROLES_PATH: ../../../../test/roles
ANSIBLE_LIBRARY: ../../../../library
@@ -32,6 +33,4 @@ scenario:
name: ubuntu
verifier:
name: testinfra
- lint:
- name: flake8
directory: ../default/tests/