Updates molecule.yml for the rest of of scenarios

freedomofpress · Oct 19, 2020 · 8ff1fb1 · 8ff1fb1
1 parent 7b1c8b9
commit 8ff1fb1
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 27 deletions.
diff --git a/molecule/ansible-config/molecule.yml b/molecule/ansible-config/molecule.yml
@@ -6,17 +6,17 @@ driver:
     login_cmd_template: 'docker exec -ti {instance} bash'
     ansible_connection_options:
       connection: local
-lint:
-  name: yamllint
+lint: |
+  yamllint
 platforms:
   - name: localhost
 provisioner:
   name: ansible
   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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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