[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>
onap · Apr 8, 2021 · 018a6ab · 018a6ab
1 parent cecf6cf
commit 018a6ab
Show file tree

Hide file tree

Showing 68 changed files with 252 additions and 276 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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,17 +29,13 @@ platforms:
       - kubernetes
 provisioner:
   name: ansible
-  lint:
-    name: ansible-lint
   env:
     ANSIBLE_ROLES_PATH: ../../../../test/roles
   playbooks:
     prepare: ../default/prepare.yml
     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
@@ -1,3 +1,4 @@
+---
 extends: default
 
 rules: