summaryrefslogtreecommitdiffstats
path: root/ansible/roles/package-repository
diff options
context:
space:
mode:
Diffstat (limited to 'ansible/roles/package-repository')
-rw-r--r--ansible/roles/package-repository/.yamllint1
-rw-r--r--ansible/roles/package-repository/molecule/default/molecule.yml11
-rw-r--r--ansible/roles/package-repository/molecule/ubuntu/molecule.yml11
3 files changed, 11 insertions, 12 deletions
diff --git a/ansible/roles/package-repository/.yamllint b/ansible/roles/package-repository/.yamllint
index 3a2255e4..8bb60ab5 100644
--- a/ansible/roles/package-repository/.yamllint
+++ b/ansible/roles/package-repository/.yamllint
@@ -1,3 +1,4 @@
+---
extends: default
rules:
diff --git a/ansible/roles/package-repository/molecule/default/molecule.yml b/ansible/roles/package-repository/molecule/default/molecule.yml
index 7abb08d4..a930394a 100644
--- a/ansible/roles/package-repository/molecule/default/molecule.yml
+++ b/ansible/roles/package-repository/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: ${PLATFORM_DISTRO:-centos}:${DISTRO_VERSION:-7}
@@ -26,8 +29,6 @@ platforms:
provisioner:
name: ansible
- lint:
- name: ansible-lint
inventory:
host_vars:
infrastructure-server:
@@ -40,5 +41,3 @@ verifier:
name: testinfra
options:
verbose: true
- lint:
- name: flake8
diff --git a/ansible/roles/package-repository/molecule/ubuntu/molecule.yml b/ansible/roles/package-repository/molecule/ubuntu/molecule.yml
index 07c2d888..f32e6490 100644
--- a/ansible/roles/package-repository/molecule/ubuntu/molecule.yml
+++ b/ansible/roles/package-repository/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: ${PLATFORM_DISTRO:-ubuntu}:${ISTRO_VERSION:-18.04}
@@ -28,8 +31,6 @@ platforms:
provisioner:
name: ansible
- lint:
- name: ansible-lint
playbooks:
converge: ../default/playbook.yml
inventory:
@@ -46,6 +47,4 @@ verifier:
name: testinfra
options:
verbose: true
- lint:
- name: flake8
directory: ../default/tests