Skip to content

Commit 02d2280

Browse files
committed
Update molecule configuration to work with 3.0.
1 parent f912a39 commit 02d2280

File tree

4 files changed

+4
-63
lines changed

4 files changed

+4
-63
lines changed

.travis.yml

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

1717
install:
1818
# Install test dependencies.
19-
- pip install molecule docker
19+
- pip install molecule yamllint ansible-lint docker
2020

2121
before_script:
2222
# 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"
@@ -18,13 +17,7 @@ platforms:
1817
pre_build_image: true
1918
provisioner:
2019
name: ansible
21-
lint:
22-
name: ansible-lint
2320
playbooks:
24-
converge: ${MOLECULE_PLAYBOOK:-playbook.yml}
21+
converge: ${MOLECULE_PLAYBOOK:-converge.yml}
2522
scenario:
2623
name: default
27-
verifier:
28-
name: testinfra
29-
lint:
30-
name: flake8

molecule/default/playbook.yml

Lines changed: 0 additions & 46 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)