Skip to content

Commit 0e0a446

Browse files
committed
Updated travis tests for Molecule 3
1 parent 0e819fc commit 0e0a446

File tree

6 files changed

+12
-36
lines changed

6 files changed

+12
-36
lines changed

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ env:
88
- ROLE_NAME: davidalger.cloud_sql_proxy
99

1010
matrix:
11+
- MOLECULE_DISTRO: centos8
1112
- MOLECULE_DISTRO: centos7
12-
MOLECULE_DOCKER_COMMAND: /usr/lib/systemd/systemd
1313

1414
install:
15-
- pip install molecule docker
15+
- pip install molecule yamllint ansible-lint docker
1616

1717
before_script:
1818
# Use actual Ansible Galaxy role name for the project directory.
File renamed without changes.
File renamed without changes.

molecule/default/molecule.yml

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,27 @@
11
---
22
dependency:
33
name: galaxy
4+
options:
5+
role-file: requirements.yml
46

57
driver:
68
name: docker
79

8-
lint:
9-
name: yamllint
10-
options:
11-
config-file: molecule/default/yaml-lint.yml
10+
lint: |
11+
set -e
12+
yamllint .
13+
ansible-lint .
1214
1315
platforms:
1416
- name: instance
1517
image: geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible
16-
command: ${MOLECULE_DOCKER_COMMAND:-"sleep infinity"}
18+
command: ${MOLECULE_DOCKER_COMMAND:-""}
19+
volumes:
20+
- /sys/fs/cgroup:/sys/fs/cgroup:ro
1721
privileged: true
1822
pre_build_image: true
1923

2024
provisioner:
2125
name: ansible
22-
lint:
23-
name: ansible-lint
2426
playbooks:
25-
converge: ${MOLECULE_PLAYBOOK:-playbook.yml}
26-
27-
scenario:
28-
name: default
29-
30-
verifier:
31-
name: testinfra
32-
lint:
33-
name: flake8
27+
converge: ${MOLECULE_PLAYBOOK:-converge.yml}

molecule/default/tests/test_default.py

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

tests/test.yml

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

0 commit comments

Comments
 (0)