From 018a6abd19c5eb32d6073c53be3a995f5fb83ed4 Mon Sep 17 00:00:00 2001
From: Bartek Grzybowski <b.grzybowski@partner.samsung.com>
Date: Thu, 8 Apr 2021 16:20:24 +0200
Subject: [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>
---
 ansible/roles/certificates/molecule/default/molecule.yml | 11 +++++------
 ansible/roles/certificates/molecule/ubuntu/molecule.yml  | 11 +++++------
 2 files changed, 10 insertions(+), 12 deletions(-)

(limited to 'ansible/roles/certificates/molecule')

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
-- 
cgit 1.2.3-korg