Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@ tests/__pycache__/
*.pyc

*.retry
.tox
16 changes: 11 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---

language: python
python: "2.7"
cache: pip

# Use the new container infrastructure
sudo: required
Expand All @@ -10,13 +10,19 @@ sudo: required
services:
- docker

# Install molecule
env:
matrix:
- ANSIBLE=2.3
- ANSIBLE=2.4
- ANSIBLE=2.5

# Install tox
install:
- pip install -r test-requirements.txt
- pip install tox-travis

# Execute the tests using the molecule docker driver
# Execute tests
script:
- molecule test --all
- tox

notifications:
webhooks: https://galaxy.ansible.com/api/v1/notifications/
4 changes: 2 additions & 2 deletions test-requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
molecule>=2.15.0
docker-py>=1.10.0
PyYAML==3.12
docker
ansible-lint>=3.4.0
testinfra>=1.7.0
20 changes: 20 additions & 0 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
[tox]
minversion = 1.8
envlist = py{27}-ansible{23,24,25}
skipsdist = true

[travis:env]
ANSIBLE=
2.3: ansible23
2.4: ansible24
2.5: ansible25

[testenv]
passenv = *
deps =
-rtest-requirements.txt
ansible23: ansible<2.4
ansible24: ansible<2.5
ansible25: ansible<2.6
commands =
{posargs:molecule test --all --destroy always}