From 4835413dee8b5b904a6dc7185df4e793e3425e13 Mon Sep 17 00:00:00 2001
From: Robert de Bock <robert@meinit.nl>
Date: Thu, 20 Feb 2020 16:51:16 +0100
Subject: [PATCH] Prepare for Molecule 3.0.0

---
 files/yamllint            | 2 --
 templates/ansible.yml.j2  | 4 ++--
 templates/molecule.yml.j2 | 8 +++-----
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/files/yamllint b/files/yamllint
index 820ad6d..c5ae64b 100644
--- a/files/yamllint
+++ b/files/yamllint
@@ -9,6 +9,4 @@ rules:
     max-spaces-inside: 1
     level: error
   line-length: disable
-  # NOTE(retr0h): Templates no longer fail this lint rule.
-  #               Uncomment if running old Molecule templates.
   truthy: disable
diff --git a/templates/ansible.yml.j2 b/templates/ansible.yml.j2
index 8d80736..8786ef3 100644
--- a/templates/ansible.yml.j2
+++ b/templates/ansible.yml.j2
@@ -18,7 +18,7 @@ jobs:
       - name: checkout
         uses: actions/checkout@v2
       - name: molecule
-        uses: robertdebock/molecule-action@1.2.8
+        uses: robertdebock/molecule-action@2.0.0
         with:
           entrypoint: /usr/local/bin/molecule
           args: lint
@@ -49,7 +49,7 @@ jobs:
       - name: parse apparmor for mysql
         run: sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
       - name: molecule
-        uses: robertdebock/molecule-action@1.2.8
+        uses: robertdebock/molecule-action@2.0.0
         with:
           image: {% raw %}${{ matrix.config.image }}{% endraw %}
 
diff --git a/templates/molecule.yml.j2 b/templates/molecule.yml.j2
index f2d49ab..a6510bc 100644
--- a/templates/molecule.yml.j2
+++ b/templates/molecule.yml.j2
@@ -4,8 +4,9 @@ dependency:
   name: galaxy
   options:
     role-file: requirements.yml
-lint:
-  name: yamllint
+lint: |
+  yamllint .
+  ansible-lint .
 driver:
   name: docker
 platforms:
@@ -25,9 +26,6 @@ provisioner:
 {% if verify.stat.exists  %}
 verifier:
   name: ansible
-  lint:
-    name: ansible-lint
-    enabled: yes
 {% endif %}
 scenario:
   name: default