molecule: linters change for compatibility with v3

ansible/molecule#2560
jobcespedes · May 4, 2020 · d7adfc4 · d7adfc4
1 parent 8b35da9
commit d7adfc4
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 19 deletions.
diff --git a/molecule/all/playbook.yml → molecule/all/converge.yml b/molecule/all/playbook.yml → molecule/all/converge.yml
diff --git a/molecule/all/molecule.yml b/molecule/all/molecule.yml
@@ -5,18 +5,14 @@ driver:
   name: vagrant
   provider:
     name: virtualbox
-lint:
-  name: yamllint
+lint: |
+    yamllint .
+    ansible-lint
+    flake8
 platforms:
   - name: instance-centos7
     box: lpf/centos7docker
   - name: instance-ubuntu1804
     box: lpf/ubuntu1804docker
 provisioner:
   name: ansible
-  lint:
-    name: ansible-lint
-verifier:
-  name: testinfra
-  lint:
-    name: flake8
diff --git a/molecule/default/playbook.yml → molecule/default/converge.yml b/molecule/default/playbook.yml → molecule/default/converge.yml
diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
@@ -4,22 +4,17 @@ dependency:
 driver:
   name: docker
   # pull: no
-lint:
-  name: yamllint
+lint: |
+    yamllint .
+    ansible-lint
+    flake8
 platforms:
-  - name: instance-${MOLECULE_DISTRO:-centos7}
-    image:
-      quay.io/jobcespedes/docker-${MOLECULE_DISTRO:-centos7}-ansible:latest
+  - name: instance_${MOLECULE_DISTRO:-centos7}
+    image: "geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible:latest"
     command: ${MOLECULE_DOCKER_COMMAND:-""}
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
     privileged: true
     pre_build_image: true
 provisioner:
   name: ansible
-  lint:
-    name: ansible-lint
-verifier:
-  name: testinfra
-  lint:
-    name: flake8