From 8ff1fb112da9f7c84d5af4a3bb7becca2e67bd0a Mon Sep 17 00:00:00 2001
From: Kushal Das <mail@kushaldas.in>
Date: Thu, 15 Oct 2020 19:13:23 +0530
Subject: [PATCH] Updates molecule.yml for the rest of of scenarios

---
 molecule/ansible-config/molecule.yml            | 12 ++++++------
 molecule/libvirt-staging-focal/destroy.yml      |  2 +-
 molecule/qubes-staging-focal/molecule.yml       |  6 +++---
 molecule/upgrade/molecule.yml                   | 10 +++++-----
 molecule/vagrant-packager/molecule.yml          | 12 ++++++------
 molecule/virtualbox-staging-xenial/molecule.yml | 12 ++++++------
 6 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/molecule/ansible-config/molecule.yml b/molecule/ansible-config/molecule.yml
index bca6324002..127a1996de 100644
--- a/molecule/ansible-config/molecule.yml
+++ b/molecule/ansible-config/molecule.yml
@@ -6,8 +6,8 @@ driver:
     login_cmd_template: 'docker exec -ti {instance} bash'
     ansible_connection_options:
       connection: local
-lint:
-  name: yamllint
+lint: |
+  yamllint
 platforms:
   - name: localhost
 provisioner:
@@ -15,8 +15,8 @@ provisioner:
   playbooks:
     prepare: ''
     create: ''
-  lint:
-    name: ansible-lint
+  lint: |
+    ansible-lint
   config_options:
     defaults:
       callback_whitelist: "profile_tasks, timer"
@@ -33,5 +33,5 @@ scenario:
     - verify
 verifier:
   name: testinfra
-  lint:
-    name: flake8
+  lint: |
+    flake8
diff --git a/molecule/libvirt-staging-focal/destroy.yml b/molecule/libvirt-staging-focal/destroy.yml
index c287e47d88..3645c7c90f 100644
--- a/molecule/libvirt-staging-focal/destroy.yml
+++ b/molecule/libvirt-staging-focal/destroy.yml
@@ -10,7 +10,7 @@
     molecule_ephemeral_directory: "{{ lookup('env', 'MOLECULE_EPHEMERAL_DIRECTORY') }}"
   tasks:
     - name: Destroy molecule instance(s)
-      molecule_vagrant:
+      vagrant:
         instance_name: "{{ item.name }}"
         platform_box: "{{ item.box }}"
         provider_name: "{{ molecule_yml.driver.provider.name }}"
diff --git a/molecule/qubes-staging-focal/molecule.yml b/molecule/qubes-staging-focal/molecule.yml
index c1401105aa..5481e0950f 100644
--- a/molecule/qubes-staging-focal/molecule.yml
+++ b/molecule/qubes-staging-focal/molecule.yml
@@ -26,8 +26,8 @@ platforms:
 
 provisioner:
   name: ansible
-  lint:
-    name: ansible-lint
+  lint: |
+    ansible-lint
   config_options:
     defaults:
       callback_whitelist: "profile_tasks, timer"
@@ -50,7 +50,7 @@ scenario:
 verifier:
   name: testinfra
   lint:
-    name: flake8
+    flake8
   directory: ../testinfra
   options:
     n: auto
diff --git a/molecule/upgrade/molecule.yml b/molecule/upgrade/molecule.yml
index 00c9b68369..76d1e6907b 100644
--- a/molecule/upgrade/molecule.yml
+++ b/molecule/upgrade/molecule.yml
@@ -5,8 +5,8 @@ driver:
   name: vagrant
   provider:
     name: libvirt
-lint:
-  name: yamllint
+lint: |
+  yamllint
 
 platforms:
   - name: app-staging
@@ -47,8 +47,8 @@ platforms:
 
 provisioner:
   name: ansible
-  lint:
-    name: ansible-lint
+  lint: |
+    ansible-lint
   inventory:
     links:
       group_vars: ../../install_files/ansible-base/group_vars
@@ -76,5 +76,5 @@ scenario:
     - converge
 verifier:
   name: testinfra
-  lint:
+  lint: |
     name: flake8
diff --git a/molecule/vagrant-packager/molecule.yml b/molecule/vagrant-packager/molecule.yml
index 6aa4bcd44e..9790ec880f 100644
--- a/molecule/vagrant-packager/molecule.yml
+++ b/molecule/vagrant-packager/molecule.yml
@@ -3,8 +3,8 @@ driver:
   name: vagrant
   provider:
     name: libvirt
-lint:
-  name: yamllint
+lint: |
+  yamllint
 
 platforms:
   - name: app-staging
@@ -35,8 +35,8 @@ platforms:
 
 provisioner:
   name: ansible
-  lint:
-    name: ansible-lint
+  lint: |
+    ansible-lint
   inventory:
     links:
       group_vars: ../../install_files/ansible-base/group_vars
@@ -64,5 +64,5 @@ scenario:
     - side_effect
 verifier:
   name: testinfra
-  lint:
-    name: flake8
+  lint: |
+    flake8
diff --git a/molecule/virtualbox-staging-xenial/molecule.yml b/molecule/virtualbox-staging-xenial/molecule.yml
index 9e0d69d88c..731e3439f7 100644
--- a/molecule/virtualbox-staging-xenial/molecule.yml
+++ b/molecule/virtualbox-staging-xenial/molecule.yml
@@ -3,8 +3,8 @@ driver:
   name: vagrant
   provider:
     name: libvirt
-lint:
-  name: yamllint
+lint: |
+  yamllint
 
 platforms:
   - name: app-staging
@@ -35,8 +35,8 @@ platforms:
 
 provisioner:
   name: ansible
-  lint:
-    name: ansible-lint
+  lint: |
+    ansible-lint
   config_options:
     defaults:
       interpreter_python: auto
@@ -59,8 +59,8 @@ scenario:
     - verify
 verifier:
   name: testinfra
-  lint:
-    name: flake8
+  lint: |
+    flake8
   directory: ../testinfra
   options:
     n: auto