From 481040facee44e617cc5a238b417a18dac7de262 Mon Sep 17 00:00:00 2001 From: Bartek Grzybowski Date: Thu, 8 Apr 2021 16:20:24 +0200 Subject: [PATCH] [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 --- ansible/roles/application/.yamllint | 1 + ansible/roles/application/molecule/custom_role/molecule.yml | 11 +++++------ ansible/roles/application/molecule/default/molecule.yml | 11 +++++------ ansible/roles/application/molecule/helm3/molecule.yml | 11 +++++------ ansible/roles/application/molecule/ubuntu/molecule.yml | 11 +++++------ ansible/roles/certificates/.yamllint | 1 + ansible/roles/certificates/molecule/default/molecule.yml | 11 +++++------ ansible/roles/certificates/molecule/ubuntu/molecule.yml | 11 +++++------ ansible/roles/chartmuseum/.yamllint | 1 + ansible/roles/chartmuseum/molecule/default/molecule.yml | 11 +++++------ ansible/roles/chartmuseum/molecule/ubuntu/molecule.yml | 11 +++++------ ansible/roles/chrony/.yamllint | 1 + ansible/roles/chrony/molecule/default/molecule.yml | 11 +++++------ .../roles/chrony/molecule/external_time_source/molecule.yml | 11 +++++------ .../chrony/molecule/external_time_source_ubuntu/molecule.yml | 11 +++++------ ansible/roles/chrony/molecule/ubuntu/molecule.yml | 11 +++++------ ansible/roles/dns/.yamllint | 1 + ansible/roles/dns/molecule/default/molecule.yml | 11 +++++------ ansible/roles/dns/molecule/ubuntu/molecule.yml | 11 +++++------ ansible/roles/docker/.yamllint | 1 + ansible/roles/docker/molecule/default/molecule.yml | 11 +++++------ ansible/roles/docker/molecule/ubuntu/molecule.yml | 11 +++++------ ansible/roles/firewall/.yamllint | 1 + ansible/roles/firewall/molecule/default/molecule.yml | 11 +++++------ ansible/roles/helm/.yamllint | 1 + ansible/roles/helm/molecule/default/molecule.yml | 11 +++++------ ansible/roles/helm/molecule/helm3/molecule.yml | 11 +++++------ ansible/roles/helm/molecule/ubuntu/molecule.yml | 11 +++++------ ansible/roles/kubectl/.yamllint | 1 + ansible/roles/kubectl/molecule/default/molecule.yml | 11 +++++------ ansible/roles/kubectl/molecule/ubuntu/molecule.yml | 11 +++++------ ansible/roles/nexus/.yamllint | 1 + ansible/roles/nexus/molecule/default/molecule.yml | 11 +++++------ ansible/roles/nexus/molecule/ubuntu/molecule.yml | 11 +++++------ ansible/roles/nfs/.yamllint | 1 + ansible/roles/nfs/molecule/default/molecule.yml | 11 +++++------ ansible/roles/nfs/molecule/ubuntu/molecule.yml | 11 +++++------ ansible/roles/nginx/.yamllint | 1 + ansible/roles/nginx/molecule/default/molecule.yml | 11 +++++------ ansible/roles/nginx/molecule/ubuntu/molecule.yml | 11 +++++------ ansible/roles/package-repository-check/.yamllint | 1 + .../package-repository-check/molecule/default/molecule.yml | 11 +++++------ .../package-repository-check/molecule/ubuntu/molecule.yml | 11 +++++------ ansible/roles/package-repository/.yamllint | 1 + .../roles/package-repository/molecule/default/molecule.yml | 11 +++++------ ansible/roles/package-repository/molecule/ubuntu/molecule.yml | 11 +++++------ ansible/roles/rancher/.yamllint | 1 + ansible/roles/rancher/molecule/default/molecule.yml | 11 +++++------ ansible/roles/resource-data/.yamllint | 1 + ansible/roles/resource-data/molecule/default/molecule.yml | 11 +++++------ ansible/roles/resource-data/molecule/ubuntu/molecule.yml | 11 +++++------ ansible/roles/rke/.yamllint | 1 + ansible/roles/rke/molecule/default/molecule.yml | 11 +++++------ ansible/roles/rke/molecule/etcd_storage/molecule.yml | 11 +++++------ ansible/roles/setup/.yamllint | 1 + ansible/roles/setup/molecule/default/molecule.yml | 11 +++++------ ansible/roles/setup/molecule/ubuntu/molecule.yml | 11 +++++------ ansible/roles/vncserver/.yamllint | 1 + ansible/roles/vncserver/molecule/default/molecule.yml | 11 +++++------ ansible/roles/vncserver/molecule/ubuntu/molecule.yml | 11 +++++------ ansible/test/play-infrastructure/.yamllint | 1 + .../test/play-infrastructure/molecule/default/molecule.yml | 11 +++++------ ansible/test/play-resources/.yamllint | 1 + ansible/test/play-resources/molecule/default/molecule.yml | 11 +++++------ ansible/test/play-resources/molecule/nfs/molecule.yml | 11 +++++------ ansible/test/play-rke/.yamllint | 1 + ansible/test/play-rke/molecule/default/molecule.yml | 11 +++++------ ansible/test/play-rke/molecule/helm3/molecule.yml | 11 +++++------ 68 files changed, 252 insertions(+), 276 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/ diff --git a/ansible/roles/certificates/.yamllint b/ansible/roles/certificates/.yamllint index e8e79a57..41fc03df 100644 --- a/ansible/roles/certificates/.yamllint +++ b/ansible/roles/certificates/.yamllint @@ -1,3 +1,4 @@ +--- extends: default rules: diff --git a/ansible/roles/certificates/molecule/default/molecule.yml b/ansible/roles/certificates/molecule/default/molecule.yml index a9e87cb5..4751dbd2 100644 --- a/ansible/roles/certificates/molecule/default/molecule.yml +++ b/ansible/roles/certificates/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} @@ -24,8 +27,6 @@ platforms: provisioner: name: ansible log: true - lint: - name: ansible-lint env: ANSIBLE_ROLES_PATH: ../../../../test/roles ANSIBLE_LIBRARY: ../../../../library @@ -63,5 +64,3 @@ verifier: name: testinfra options: verbose: true - lint: - name: flake8 diff --git a/ansible/roles/certificates/molecule/ubuntu/molecule.yml b/ansible/roles/certificates/molecule/ubuntu/molecule.yml index 051379df..9708bd9b 100644 --- a/ansible/roles/certificates/molecule/ubuntu/molecule.yml +++ b/ansible/roles/certificates/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} @@ -23,8 +26,6 @@ platforms: provisioner: name: ansible log: true - lint: - name: ansible-lint env: ANSIBLE_ROLES_PATH: ../../../../test/roles ANSIBLE_LIBRARY: ../../../../library @@ -64,6 +65,4 @@ verifier: name: testinfra options: verbose: true - lint: - name: flake8 directory: ../default/tests 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/ diff --git a/ansible/roles/chrony/.yamllint b/ansible/roles/chrony/.yamllint index ad0be760..c5ae64be 100644 --- a/ansible/roles/chrony/.yamllint +++ b/ansible/roles/chrony/.yamllint @@ -1,3 +1,4 @@ +--- extends: default rules: diff --git a/ansible/roles/chrony/molecule/default/molecule.yml b/ansible/roles/chrony/molecule/default/molecule.yml index a5b48674..78d6f32a 100644 --- a/ansible/roles/chrony/molecule/default/molecule.yml +++ b/ansible/roles/chrony/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: infra_host image: molecule-${PREBUILD_PLATFORM_DISTRO:-centos}:${PREBUILD_DISTRO_VERSION:-centos7.6} @@ -26,13 +29,9 @@ platforms: - kubernetes provisioner: name: ansible - lint: - name: ansible-lint env: ANSIBLE_ROLES_PATH: ../../../../test/roles verifier: name: testinfra - lint: - name: flake8 options: v: 1 diff --git a/ansible/roles/chrony/molecule/external_time_source/molecule.yml b/ansible/roles/chrony/molecule/external_time_source/molecule.yml index e38f4295..ac32f330 100644 --- a/ansible/roles/chrony/molecule/external_time_source/molecule.yml +++ b/ansible/roles/chrony/molecule/external_time_source/molecule.yml @@ -3,8 +3,11 @@ dependency: name: galaxy driver: name: docker -lint: - name: yamllint +lint: | + set -e + yamllint . + ansible-lint . + flake8 platforms: - name: infra_host image: molecule-${PREBUILD_PLATFORM_DISTRO:-centos}:${PREBUILD_DISTRO_VERSION:-centos7.6} @@ -26,8 +29,6 @@ platforms: - kubernetes provisioner: name: ansible - lint: - name: ansible-lint env: ANSIBLE_ROLES_PATH: ../../../../test/roles inventory: @@ -42,8 +43,6 @@ provisioner: prepare: ../default/prepare.yml verifier: name: testinfra - lint: - name: flake8 options: v: 1 directory: ../default/tests/ diff --git a/ansible/roles/chrony/molecule/external_time_source_ubuntu/molecule.yml b/ansible/roles/chrony/molecule/external_time_source_ubuntu/molecule.yml index 6cc2854a..0fbef39b 100644 --- a/ansible/roles/chrony/molecule/external_time_source_ubuntu/molecule.yml +++ b/ansible/roles/chrony/molecule/external_time_source_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: infra_host-ubuntu image: molecule-${PREBUILD_PLATFORM_DISTRO:-ubuntu}:${PREBUILD_DISTRO_VERSION:-18.04} @@ -26,8 +29,6 @@ platforms: - kubernetes provisioner: name: ansible - lint: - name: ansible-lint env: ANSIBLE_ROLES_PATH: ../../../../test/roles inventory: @@ -43,8 +44,6 @@ provisioner: converge: ../external_time_source/playbook.yml verifier: name: testinfra - lint: - name: flake8 options: v: 1 directory: ../default/tests/ diff --git a/ansible/roles/chrony/molecule/ubuntu/molecule.yml b/ansible/roles/chrony/molecule/ubuntu/molecule.yml index e7ede8c7..a92dfa3b 100644 --- a/ansible/roles/chrony/molecule/ubuntu/molecule.yml +++ b/ansible/roles/chrony/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: infra_host-ubuntu image: molecule-${PREBUILD_PLATFORM_DISTRO:-ubuntu}:${PREBUILD_DISTRO_VERSION:-18.04} @@ -26,8 +29,6 @@ platforms: - kubernetes provisioner: name: ansible - lint: - name: ansible-lint env: ANSIBLE_ROLES_PATH: ../../../../test/roles playbooks: @@ -35,8 +36,6 @@ provisioner: converge: ../default/playbook.yml verifier: name: testinfra - lint: - name: flake8 options: v: 1 directory: ../default/tests/ 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 diff --git a/ansible/roles/docker/.yamllint b/ansible/roles/docker/.yamllint index e8e79a57..41fc03df 100644 --- a/ansible/roles/docker/.yamllint +++ b/ansible/roles/docker/.yamllint @@ -1,3 +1,4 @@ +--- extends: default rules: diff --git a/ansible/roles/docker/molecule/default/molecule.yml b/ansible/roles/docker/molecule/default/molecule.yml index efa7f0ae..031aa5fc 100644 --- a/ansible/roles/docker/molecule/default/molecule.yml +++ b/ansible/roles/docker/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} @@ -20,8 +23,6 @@ platforms: - /var/lib/docker provisioner: name: ansible - lint: - name: ansible-lint env: ANSIBLE_ROLES_PATH: ../../../../test/roles ANSIBLE_LIBRARY: ../../../../library @@ -35,7 +36,5 @@ verifier: name: testinfra options: verbose: true - lint: - name: flake8 options: ignore: W291 # trailing whitespace diff --git a/ansible/roles/docker/molecule/ubuntu/molecule.yml b/ansible/roles/docker/molecule/ubuntu/molecule.yml index 8325ffb3..751782af 100644 --- a/ansible/roles/docker/molecule/ubuntu/molecule.yml +++ b/ansible/roles/docker/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} @@ -20,8 +23,6 @@ platforms: - /var/lib/docker provisioner: name: ansible - lint: - name: ansible-lint playbooks: prepare: ../default/prepare.yml converge: ../default/playbook.yml @@ -39,8 +40,6 @@ verifier: name: testinfra options: verbose: true - lint: - name: flake8 options: ignore: W291 # trailing whitespace directory: ../default/tests/ diff --git a/ansible/roles/firewall/.yamllint b/ansible/roles/firewall/.yamllint index ad0be760..c5ae64be 100644 --- a/ansible/roles/firewall/.yamllint +++ b/ansible/roles/firewall/.yamllint @@ -1,3 +1,4 @@ +--- extends: default rules: diff --git a/ansible/roles/firewall/molecule/default/molecule.yml b/ansible/roles/firewall/molecule/default/molecule.yml index 81ace9ce..2c64d41a 100644 --- a/ansible/roles/firewall/molecule/default/molecule.yml +++ b/ansible/roles/firewall/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: centos7 image: couchbase/centos7-systemd @@ -23,11 +26,7 @@ provisioner: name: ansible env: ANSIBLE_ROLES_PATH: ../../../../test/roles - lint: - name: ansible-lint verifier: name: testinfra options: verbose: true - lint: - name: flake8 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 diff --git a/ansible/roles/kubectl/.yamllint b/ansible/roles/kubectl/.yamllint index ad0be760..c5ae64be 100644 --- a/ansible/roles/kubectl/.yamllint +++ b/ansible/roles/kubectl/.yamllint @@ -1,3 +1,4 @@ +--- extends: default rules: diff --git a/ansible/roles/kubectl/molecule/default/molecule.yml b/ansible/roles/kubectl/molecule/default/molecule.yml index 040564e2..b1a66be2 100644 --- a/ansible/roles/kubectl/molecule/default/molecule.yml +++ b/ansible/roles/kubectl/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} @@ -15,8 +18,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/kubectl/molecule/ubuntu/molecule.yml b/ansible/roles/kubectl/molecule/ubuntu/molecule.yml index 1b2c9f0e..e9422fd2 100644 --- a/ansible/roles/kubectl/molecule/ubuntu/molecule.yml +++ b/ansible/roles/kubectl/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} @@ -15,8 +18,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/ diff --git a/ansible/roles/nexus/.yamllint b/ansible/roles/nexus/.yamllint index ad0be760..c5ae64be 100644 --- a/ansible/roles/nexus/.yamllint +++ b/ansible/roles/nexus/.yamllint @@ -1,3 +1,4 @@ +--- extends: default rules: diff --git a/ansible/roles/nexus/molecule/default/molecule.yml b/ansible/roles/nexus/molecule/default/molecule.yml index e38640d4..735bf1bb 100644 --- a/ansible/roles/nexus/molecule/default/molecule.yml +++ b/ansible/roles/nexus/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} @@ -22,11 +25,7 @@ provisioner: inventory: links: group_vars: ../../../../group_vars - lint: - name: ansible-lint scenario: name: default verifier: name: testinfra - lint: - name: flake8 diff --git a/ansible/roles/nexus/molecule/ubuntu/molecule.yml b/ansible/roles/nexus/molecule/ubuntu/molecule.yml index 9955e7d5..d882633a 100644 --- a/ansible/roles/nexus/molecule/ubuntu/molecule.yml +++ b/ansible/roles/nexus/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} @@ -22,8 +25,6 @@ provisioner: inventory: links: group_vars: ../../../../group_vars - lint: - name: ansible-lint playbooks: prepare: ../default/prepare.yml converge: ../default/playbook.yml @@ -32,5 +33,3 @@ scenario: name: ubuntu verifier: name: testinfra - lint: - name: flake8 diff --git a/ansible/roles/nfs/.yamllint b/ansible/roles/nfs/.yamllint index ad0be760..c5ae64be 100644 --- a/ansible/roles/nfs/.yamllint +++ b/ansible/roles/nfs/.yamllint @@ -1,3 +1,4 @@ +--- extends: default rules: diff --git a/ansible/roles/nfs/molecule/default/molecule.yml b/ansible/roles/nfs/molecule/default/molecule.yml index 9af32360..e41b8a7d 100644 --- a/ansible/roles/nfs/molecule/default/molecule.yml +++ b/ansible/roles/nfs/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: kubernetes-node-1 image: molecule-${PREBUILD_PLATFORM_DISTRO:-centos}:${PREBUILD_DISTRO_VERSION:-centos7.6} @@ -41,11 +44,7 @@ provisioner: links: group_vars: ../../../../group_vars host_vars: host_vars - lint: - name: ansible-lint scenario: name: default verifier: name: testinfra - lint: - name: flake8 diff --git a/ansible/roles/nfs/molecule/ubuntu/molecule.yml b/ansible/roles/nfs/molecule/ubuntu/molecule.yml index 3fe393fc..61728cde 100644 --- a/ansible/roles/nfs/molecule/ubuntu/molecule.yml +++ b/ansible/roles/nfs/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: kubernetes-node-1 image: molecule-${PREBUILD_PLATFORM_DISTRO:-ubuntu}:${PREBUILD_DISTRO_VERSION:-18.04} @@ -40,8 +43,6 @@ provisioner: links: group_vars: ../../../../group_vars host_vars: ../default/host_vars - lint: - name: ansible-lint playbooks: prepare: ../default/prepare.yml converge: ../default/playbook.yml @@ -49,6 +50,4 @@ scenario: name: ubuntu verifier: name: testinfra - lint: - name: flake8 directory: ../default/tests diff --git a/ansible/roles/nginx/.yamllint b/ansible/roles/nginx/.yamllint index ad0be760..c5ae64be 100644 --- a/ansible/roles/nginx/.yamllint +++ b/ansible/roles/nginx/.yamllint @@ -1,3 +1,4 @@ +--- extends: default rules: diff --git a/ansible/roles/nginx/molecule/default/molecule.yml b/ansible/roles/nginx/molecule/default/molecule.yml index 63c47724..c5145611 100644 --- a/ansible/roles/nginx/molecule/default/molecule.yml +++ b/ansible/roles/nginx/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} @@ -22,9 +25,5 @@ provisioner: inventory: links: group_vars: ../../../../group_vars - lint: - name: ansible-lint verifier: name: testinfra - lint: - name: flake8 diff --git a/ansible/roles/nginx/molecule/ubuntu/molecule.yml b/ansible/roles/nginx/molecule/ubuntu/molecule.yml index 9955e7d5..d882633a 100644 --- a/ansible/roles/nginx/molecule/ubuntu/molecule.yml +++ b/ansible/roles/nginx/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} @@ -22,8 +25,6 @@ provisioner: inventory: links: group_vars: ../../../../group_vars - lint: - name: ansible-lint playbooks: prepare: ../default/prepare.yml converge: ../default/playbook.yml @@ -32,5 +33,3 @@ scenario: name: ubuntu verifier: name: testinfra - lint: - name: flake8 diff --git a/ansible/roles/package-repository-check/.yamllint b/ansible/roles/package-repository-check/.yamllint index ad0be760..c5ae64be 100755 --- a/ansible/roles/package-repository-check/.yamllint +++ b/ansible/roles/package-repository-check/.yamllint @@ -1,3 +1,4 @@ +--- extends: default rules: diff --git a/ansible/roles/package-repository-check/molecule/default/molecule.yml b/ansible/roles/package-repository-check/molecule/default/molecule.yml index 27003dcb..b60f0091 100755 --- a/ansible/roles/package-repository-check/molecule/default/molecule.yml +++ b/ansible/roles/package-repository-check/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: infra_host image: molecule-${PREBUILD_PLATFORM_DISTRO:-centos}:${PREBUILD_DISTRO_VERSION:-centos7.6} @@ -26,8 +29,6 @@ platforms: - kubernetes provisioner: name: ansible - lint: - name: ansible-lint env: ANSIBLE_ROLES_PATH: ../../../../test/roles scenario: @@ -52,7 +53,5 @@ scenario: - destroy verifier: name: testinfra - lint: - name: flake8 options: v: 1 diff --git a/ansible/roles/package-repository-check/molecule/ubuntu/molecule.yml b/ansible/roles/package-repository-check/molecule/ubuntu/molecule.yml index ba08e86b..23e7a61e 100755 --- a/ansible/roles/package-repository-check/molecule/ubuntu/molecule.yml +++ b/ansible/roles/package-repository-check/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}:${DISTRO_VERSION:-18.04} @@ -18,8 +21,6 @@ platforms: provisioner: name: ansible - lint: - name: ansible-lint playbooks: converge: ../default/playbook.yml inventory: @@ -48,7 +49,5 @@ scenario: - destroy verifier: name: testinfra - lint: - name: flake8 options: v: 1 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 diff --git a/ansible/roles/rancher/.yamllint b/ansible/roles/rancher/.yamllint index ad0be760..c5ae64be 100644 --- a/ansible/roles/rancher/.yamllint +++ b/ansible/roles/rancher/.yamllint @@ -1,3 +1,4 @@ +--- extends: default rules: diff --git a/ansible/roles/rancher/molecule/default/molecule.yml b/ansible/roles/rancher/molecule/default/molecule.yml index eb7f8c19..e9948cc2 100644 --- a/ansible/roles/rancher/molecule/default/molecule.yml +++ b/ansible/roles/rancher/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} @@ -60,8 +63,6 @@ provisioner: # ansible_sudo_pass: ${LOCALHOST_ANSIBLE_SUDO_PASS:-""} # ansible_ssh_pass: ${LOCALHOST_ANSIBLE_PASSWORD:-""} # End of 2) - lint: - name: ansible-lint scenario: name: default test_sequence: @@ -84,5 +85,3 @@ scenario: - destroy verifier: name: testinfra - lint: - name: flake8 diff --git a/ansible/roles/resource-data/.yamllint b/ansible/roles/resource-data/.yamllint index e8e79a57..41fc03df 100644 --- a/ansible/roles/resource-data/.yamllint +++ b/ansible/roles/resource-data/.yamllint @@ -1,3 +1,4 @@ +--- extends: default rules: diff --git a/ansible/roles/resource-data/molecule/default/molecule.yml b/ansible/roles/resource-data/molecule/default/molecule.yml index 03f40cb6..ec41c2f2 100644 --- a/ansible/roles/resource-data/molecule/default/molecule.yml +++ b/ansible/roles/resource-data/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: resource-host @@ -35,13 +38,9 @@ platforms: provisioner: name: ansible log: true - lint: - name: ansible-lint env: ANSIBLE_ROLES_PATH: ../../../../test/roles/ scenario: name: default verifier: name: testinfra - lint: - name: flake8 diff --git a/ansible/roles/resource-data/molecule/ubuntu/molecule.yml b/ansible/roles/resource-data/molecule/ubuntu/molecule.yml index 7f0eb4e4..df886dbd 100644 --- a/ansible/roles/resource-data/molecule/ubuntu/molecule.yml +++ b/ansible/roles/resource-data/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: resource-host @@ -35,8 +38,6 @@ platforms: provisioner: name: ansible log: true - lint: - name: ansible-lint env: ANSIBLE_ROLES_PATH: ../../../../test/roles/ playbooks: @@ -46,6 +47,4 @@ scenario: name: ubuntu verifier: name: testinfra - lint: - name: flake8 directory: ../default/tests diff --git a/ansible/roles/rke/.yamllint b/ansible/roles/rke/.yamllint index ad0be760..c5ae64be 100644 --- a/ansible/roles/rke/.yamllint +++ b/ansible/roles/rke/.yamllint @@ -1,3 +1,4 @@ +--- extends: default rules: diff --git a/ansible/roles/rke/molecule/default/molecule.yml b/ansible/roles/rke/molecule/default/molecule.yml index 2e25531c..64da190f 100644 --- a/ansible/roles/rke/molecule/default/molecule.yml +++ b/ansible/roles/rke/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} @@ -35,11 +38,7 @@ provisioner: cluster_config_dir: /opt/onap/cluster options: e: "app_data_path=/opt/onap" - lint: - name: ansible-lint scenario: name: default verifier: name: testinfra - lint: - name: flake8 diff --git a/ansible/roles/rke/molecule/etcd_storage/molecule.yml b/ansible/roles/rke/molecule/etcd_storage/molecule.yml index bff115e5..9c9bb9b8 100644 --- a/ansible/roles/rke/molecule/etcd_storage/molecule.yml +++ b/ansible/roles/rke/molecule/etcd_storage/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} @@ -45,11 +48,7 @@ provisioner: prepare: ../default/prepare.yml converge: ../default/playbook.yml destroy: ../default/destroy.yml - lint: - name: ansible-lint scenario: name: etcd_storage verifier: name: testinfra - lint: - name: flake8 diff --git a/ansible/roles/setup/.yamllint b/ansible/roles/setup/.yamllint index 3a2255e4..8bb60ab5 100644 --- a/ansible/roles/setup/.yamllint +++ b/ansible/roles/setup/.yamllint @@ -1,3 +1,4 @@ +--- extends: default rules: diff --git a/ansible/roles/setup/molecule/default/molecule.yml b/ansible/roles/setup/molecule/default/molecule.yml index 1e9a4c19..82ab123a 100644 --- a/ansible/roles/setup/molecule/default/molecule.yml +++ b/ansible/roles/setup/molecule/default/molecule.yml @@ -3,18 +3,17 @@ dependency: name: galaxy driver: name: docker -lint: - name: yamllint +lint: | + set -e + yamllint . + ansible-lint . + flake8 platforms: - name: instance image: ${PLATFORM_DISTRO:-centos}:${DISTRO_VERSION:-7} provisioner: name: ansible - lint: - name: ansible-lint scenario: name: default verifier: name: testinfra - lint: - name: flake8 diff --git a/ansible/roles/setup/molecule/ubuntu/molecule.yml b/ansible/roles/setup/molecule/ubuntu/molecule.yml index 16dcedf7..d0cce594 100644 --- a/ansible/roles/setup/molecule/ubuntu/molecule.yml +++ b/ansible/roles/setup/molecule/ubuntu/molecule.yml @@ -3,22 +3,21 @@ dependency: name: galaxy driver: name: docker -lint: - name: yamllint +lint: | + set -e + yamllint . + ansible-lint . + flake8 platforms: - name: instance image: ${PLATFORM_DISTRO:-ubuntu}:${DISTRO_VERSION:-18.04} dockerfile: ../default/Dockerfile.j2 provisioner: name: ansible - lint: - name: ansible-lint playbooks: converge: ../default/playbook.yml scenario: name: ubuntu verifier: name: testinfra - lint: - name: flake8 directory: ../default/tests/ diff --git a/ansible/roles/vncserver/.yamllint b/ansible/roles/vncserver/.yamllint index ad0be760..c5ae64be 100644 --- a/ansible/roles/vncserver/.yamllint +++ b/ansible/roles/vncserver/.yamllint @@ -1,3 +1,4 @@ +--- extends: default rules: diff --git a/ansible/roles/vncserver/molecule/default/molecule.yml b/ansible/roles/vncserver/molecule/default/molecule.yml index 5f7e4062..4486c00c 100644 --- a/ansible/roles/vncserver/molecule/default/molecule.yml +++ b/ansible/roles/vncserver/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: - infrastructure provisioner: name: ansible - lint: - name: ansible-lint env: ANSIBLE_ROLES_PATH: ../../../../test/roles inventory: @@ -26,7 +27,5 @@ provisioner: group_vars: ../../../../group_vars verifier: name: testinfra - lint: - name: flake8 options: v: 1 diff --git a/ansible/roles/vncserver/molecule/ubuntu/molecule.yml b/ansible/roles/vncserver/molecule/ubuntu/molecule.yml index d821cd73..38dbe7fd 100644 --- a/ansible/roles/vncserver/molecule/ubuntu/molecule.yml +++ b/ansible/roles/vncserver/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: - infrastructure provisioner: name: ansible - lint: - name: ansible-lint playbooks: prepare: ../default/prepare.yml converge: ../default/playbook.yml @@ -32,8 +33,6 @@ scenario: name: ubuntu verifier: name: testinfra - lint: - name: flake8 options: v: 1 directory: ../default/tests/ diff --git a/ansible/test/play-infrastructure/.yamllint b/ansible/test/play-infrastructure/.yamllint index ad0be760..c5ae64be 100644 --- a/ansible/test/play-infrastructure/.yamllint +++ b/ansible/test/play-infrastructure/.yamllint @@ -1,3 +1,4 @@ +--- extends: default rules: diff --git a/ansible/test/play-infrastructure/molecule/default/molecule.yml b/ansible/test/play-infrastructure/molecule/default/molecule.yml index c4b7901a..1098dc80 100644 --- a/ansible/test/play-infrastructure/molecule/default/molecule.yml +++ b/ansible/test/play-infrastructure/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} @@ -43,8 +46,6 @@ provisioner: inventory: links: group_vars: ../../../../group_vars - lint: - name: ansible-lint scenario: name: default test_sequence: @@ -67,5 +68,3 @@ scenario: - destroy verifier: name: testinfra - lint: - name: flake8 diff --git a/ansible/test/play-resources/.yamllint b/ansible/test/play-resources/.yamllint index ad0be760..c5ae64be 100644 --- a/ansible/test/play-resources/.yamllint +++ b/ansible/test/play-resources/.yamllint @@ -1,3 +1,4 @@ +--- extends: default rules: diff --git a/ansible/test/play-resources/molecule/default/molecule.yml b/ansible/test/play-resources/molecule/default/molecule.yml index 9ac1aaca..5c7dbd54 100644 --- a/ansible/test/play-resources/molecule/default/molecule.yml +++ b/ansible/test/play-resources/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: resource-host image: molecule-${PREBUILD_PLATFORM_DISTRO:-centos}:${PREBUILD_DISTRO_VERSION:-centos7.6} @@ -33,9 +36,5 @@ provisioner: name: ansible env: ANSIBLE_ROLES_PATH: ../../../../roles:../../../roles - lint: - name: ansible-lint verifier: name: testinfra - lint: - name: flake8 diff --git a/ansible/test/play-resources/molecule/nfs/molecule.yml b/ansible/test/play-resources/molecule/nfs/molecule.yml index 11726396..25a14065 100644 --- a/ansible/test/play-resources/molecule/nfs/molecule.yml +++ b/ansible/test/play-resources/molecule/nfs/molecule.yml @@ -3,8 +3,11 @@ dependency: name: galaxy driver: name: docker -lint: - name: yamllint +lint: | + set -e + yamllint . + ansible-lint . + flake8 platforms: - name: resource-host image: molecule-${PREBUILD_PLATFORM_DISTRO:-centos}:${PREBUILD_DISTRO_VERSION:-centos7.6} @@ -34,9 +37,5 @@ provisioner: name: ansible env: ANSIBLE_ROLES_PATH: ../../../../roles:../../../roles - lint: - name: ansible-lint verifier: name: testinfra - lint: - name: flake8 diff --git a/ansible/test/play-rke/.yamllint b/ansible/test/play-rke/.yamllint index ad0be760..c5ae64be 100644 --- a/ansible/test/play-rke/.yamllint +++ b/ansible/test/play-rke/.yamllint @@ -1,3 +1,4 @@ +--- extends: default rules: diff --git a/ansible/test/play-rke/molecule/default/molecule.yml b/ansible/test/play-rke/molecule/default/molecule.yml index 519679a5..af861144 100644 --- a/ansible/test/play-rke/molecule/default/molecule.yml +++ b/ansible/test/play-rke/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} @@ -29,11 +32,7 @@ provisioner: env: ANSIBLE_ROLES_PATH: ../../../../test/roles ANSIBLE_LIBRARY: ../../../../library - lint: - name: ansible-lint scenario: name: default verifier: name: testinfra - lint: - name: flake8 diff --git a/ansible/test/play-rke/molecule/helm3/molecule.yml b/ansible/test/play-rke/molecule/helm3/molecule.yml index 83a2fd20..e76da046 100644 --- a/ansible/test/play-rke/molecule/helm3/molecule.yml +++ b/ansible/test/play-rke/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 image: molecule-${PREBUILD_PLATFORM_DISTRO:-centos}:${PREBUILD_DISTRO_VERSION:-centos7.6} @@ -29,11 +32,7 @@ provisioner: env: ANSIBLE_ROLES_PATH: ../../../../test/roles ANSIBLE_LIBRARY: ../../../../library - lint: - name: ansible-lint scenario: name: helm3 verifier: name: testinfra - lint: - name: flake8 -- 2.16.6