[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 <b.grzybowski@partner.samsung.com>

diff --git a/ansible/roles/application/.yamllint b/ansible/roles/application/.yamllint
index ad0be76..c5ae64b 100644 (file)
--- 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 eeea94b..6000e0e 100644 (file)
--- 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 9d4102b..e516f0f 100644 (file)
--- 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 fce5909..50e9cb8 100644 (file)
--- 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 8552ce5..aa8151f 100644 (file)
--- 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 e8e79a5..41fc03d 100644 (file)
--- 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 a9e87cb..4751dbd 100644 (file)
--- 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 051379d..9708bd9 100644 (file)
--- 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 ad0be76..c5ae64b 100644 (file)
--- 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 9c5d1c2..5c9dce7 100644 (file)
--- 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 5f351a9..307988a 100644 (file)
--- 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 ad0be76..c5ae64b 100644 (file)
--- 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 a5b4867..78d6f32 100644 (file)
--- 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 e38f429..ac32f33 100644 (file)
--- 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 6cc2854..0fbef39 100644 (file)
--- 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 e7ede8c..a92dfa3 100644 (file)
--- 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 ad0be76..c5ae64b 100644 (file)
--- 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 00c63ca..a2d2c20 100644 (file)
--- 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 5428c04..5621b73 100644 (file)
--- 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 e8e79a5..41fc03d 100644 (file)
--- 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 efa7f0a..031aa5f 100644 (file)
--- 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 8325ffb..751782a 100644 (file)
--- 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 ad0be76..c5ae64b 100644 (file)
--- 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 81ace9c..2c64d41 100644 (file)
--- 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 ad0be76..c5ae64b 100644 (file)
--- 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 359d3ab..b20e2a1 100644 (file)
--- 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 e863447..4b582f5 100644 (file)
--- 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 a43ff07..9a97288 100644 (file)
--- 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 ad0be76..c5ae64b 100644 (file)
--- 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 040564e..b1a66be 100644 (file)
--- 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 1b2c9f0..e9422fd 100644 (file)
--- 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 ad0be76..c5ae64b 100644 (file)
--- 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 e38640d..735bf1b 100644 (file)
--- 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 9955e7d..d882633 100644 (file)
--- 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 ad0be76..c5ae64b 100644 (file)
--- 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 9af3236..e41b8a7 100644 (file)
--- 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 3fe393f..61728cd 100644 (file)
--- 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 ad0be76..c5ae64b 100644 (file)
--- 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 63c4772..c514561 100644 (file)
--- 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 9955e7d..d882633 100644 (file)
--- 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 ad0be76..c5ae64b 100755 (executable)
--- 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 27003dc..b60f009 100755 (executable)
--- 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 ba08e86..23e7a61 100755 (executable)
--- 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 3a2255e..8bb60ab 100644 (file)
--- 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 7abb08d..a930394 100644 (file)
--- 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 07c2d88..f32e649 100644 (file)
--- 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 ad0be76..c5ae64b 100644 (file)
--- 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 eb7f8c1..e9948cc 100644 (file)
--- 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 e8e79a5..41fc03d 100644 (file)
--- 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 03f40cb..ec41c2f 100644 (file)
--- 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 7f0eb4e..df886db 100644 (file)
--- 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 ad0be76..c5ae64b 100644 (file)
--- 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 2e25531..64da190 100644 (file)
--- 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 bff115e..9c9bb9b 100644 (file)
--- 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 3a2255e..8bb60ab 100644 (file)
--- 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 1e9a4c1..82ab123 100644 (file)
--- 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 16dcedf..d0cce59 100644 (file)
--- 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 ad0be76..c5ae64b 100644 (file)
--- 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 5f7e406..4486c00 100644 (file)
--- 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 d821cd7..38dbe7f 100644 (file)
--- 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 ad0be76..c5ae64b 100644 (file)
--- 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 c4b7901..1098dc8 100644 (file)
--- 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 ad0be76..c5ae64b 100644 (file)
--- 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 9ac1aac..5c7dbd5 100644 (file)
--- 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 1172639..25a1406 100644 (file)
--- 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 ad0be76..c5ae64b 100644 (file)
--- 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 519679a..af86114 100644 (file)
--- 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 83a2fd2..e76da04 100644 (file)
--- 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