Skip to content

Commit 2476e09

Browse files
committed
Update molecule configuration to work with 3.0.
1 parent dca97d2 commit 2476e09

File tree

4 files changed

+4
-34
lines changed

4 files changed

+4
-34
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ env:
1818

1919
install:
2020
# Install test dependencies.
21-
- pip install molecule docker
21+
- pip install molecule yamllint ansible-lint docker
2222

2323
before_script:
2424
# Use actual Ansible Galaxy role name for the project directory.

molecule/default/molecule.yml

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,8 @@ dependency:
44
driver:
55
name: docker
66
lint:
7-
name: yamllint
8-
options:
9-
config-file: molecule/default/yaml-lint.yml
7+
yamllint .
8+
ansible-lint
109
platforms:
1110
- name: instance
1211
image: "geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible:latest"
@@ -17,13 +16,7 @@ platforms:
1716
pre_build_image: true
1817
provisioner:
1918
name: ansible
20-
lint:
21-
name: ansible-lint
2219
playbooks:
23-
converge: ${MOLECULE_PLAYBOOK:-playbook.yml}
20+
converge: ${MOLECULE_PLAYBOOK:-converge.yml}
2421
scenario:
2522
name: default
26-
verifier:
27-
name: testinfra
28-
lint:
29-
name: flake8

molecule/default/playbook.yml

Lines changed: 0 additions & 17 deletions
This file was deleted.

molecule/default/yaml-lint.yml

Lines changed: 0 additions & 6 deletions
This file was deleted.

0 commit comments

Comments
 (0)