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/vncserver/.yamllint                     |  1 +
 ansible/roles/vncserver/molecule/default/molecule.yml | 11 +++++------
 ansible/roles/vncserver/molecule/ubuntu/molecule.yml  | 11 +++++------
 3 files changed, 11 insertions(+), 12 deletions(-)

(limited to 'ansible/roles/vncserver')

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