diff options
Diffstat (limited to 'ansible/roles/application')
5 files changed, 21 insertions, 24 deletions
diff --git a/ansible/roles/application/.yamllint b/ansible/roles/application/.yamllint index ad0be760..c5ae64be 100644 --- a/ansible/roles/application/.yamllint +++ b/ansible/roles/application/.yamllint @@ -1,3 +1,4 @@ +--- extends: default rules: diff --git a/ansible/roles/application/molecule/custom_role/molecule.yml b/ansible/roles/application/molecule/custom_role/molecule.yml index eeea94b3..6000e0e7 100644 --- a/ansible/roles/application/molecule/custom_role/molecule.yml +++ b/ansible/roles/application/molecule/custom_role/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 image: centos:7 @@ -30,8 +33,6 @@ provisioner: application_pre_install_role: application/test-patch-role application_post_install_role: application/test-patch-role helm_version: v2 - lint: - name: ansible-lint playbooks: prepare: ../default/prepare.yml converge: ../default/playbook.yml @@ -52,5 +53,3 @@ scenario: - destroy verifier: name: testinfra - lint: - name: flake8 diff --git a/ansible/roles/application/molecule/default/molecule.yml b/ansible/roles/application/molecule/default/molecule.yml index 9d4102b8..e516f0f2 100644 --- a/ansible/roles/application/molecule/default/molecule.yml +++ b/ansible/roles/application/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 image: centos:7 @@ -28,8 +31,6 @@ provisioner: - onap app_helm_chart_name: "{{ app_name }}" helm_version: v2 - lint: - name: ansible-lint scenario: name: default test_sequence: @@ -55,5 +56,3 @@ scenario: - destroy verifier: name: testinfra - lint: - name: flake8 diff --git a/ansible/roles/application/molecule/helm3/molecule.yml b/ansible/roles/application/molecule/helm3/molecule.yml index fce59098..50e9cb84 100644 --- a/ansible/roles/application/molecule/helm3/molecule.yml +++ b/ansible/roles/application/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: instance-helm3 image: centos:7 @@ -28,8 +31,6 @@ provisioner: - onap app_helm_chart_name: "{{ app_name }}" helm_version: v3 - lint: - name: ansible-lint playbooks: prepare: ../default/prepare.yml converge: ../default/playbook.yml @@ -50,5 +51,3 @@ scenario: - destroy verifier: name: testinfra - lint: - name: flake8 diff --git a/ansible/roles/application/molecule/ubuntu/molecule.yml b/ansible/roles/application/molecule/ubuntu/molecule.yml index 8552ce59..aa8151fa 100644 --- a/ansible/roles/application/molecule/ubuntu/molecule.yml +++ b/ansible/roles/application/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 image: ubuntu:18.04 @@ -29,8 +32,6 @@ provisioner: - onap app_helm_chart_name: "{{ app_name }}" helm_version: v2 - lint: - name: ansible-lint playbooks: prepare: ../default/prepare.yml converge: ../default/playbook.yml @@ -60,6 +61,4 @@ scenario: - destroy verifier: name: testinfra - lint: - name: flake8 directory: ../default/tests/ |