[MOLECULE 3.3.0] Drop scenario name in molecule.yml

[oom/offline-installer.git] / ansible / roles / vncserver / molecule / ubuntu / molecule.yml

diff --git a/ansible/roles/vncserver/molecule/ubuntu/molecule.yml b/ansible/roles/vncserver/molecule/ubuntu/molecule.yml
index d821cd7..113869e 100644 (file)
--- 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,23 +20,17 @@ platforms:
       - infrastructure
 provisioner:
   name: ansible
-  lint:
-    name: ansible-lint
   playbooks:
     prepare: ../default/prepare.yml
-    converge: ../default/playbook.yml
+    converge: ../default/converge.yml
     cleanup: ../default/cleanup.yml
   env:
     ANSIBLE_ROLES_PATH: ../../../../test/roles
   inventory:
     links:
       group_vars: ../../../../group_vars
-scenario:
-  name: ubuntu
 verifier:
   name: testinfra
-  lint:
-    name: flake8
   options:
     v: 1
   directory: ../default/tests/