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

(limited to 'ansible/roles/rke')

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