Skip to content

Commit

Permalink
add ansible 2.10, upgrade to molecule 3
Browse files Browse the repository at this point in the history
  • Loading branch information
infothrill committed Sep 26, 2020
1 parent 70a15c9 commit a732dcb
Show file tree
Hide file tree
Showing 7 changed files with 20 additions and 11 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ python:
env:
- ANSIBLE="2.8"
- ANSIBLE="2.9"
- ANSIBLE="2.10"
install: pip install tox-travis
script: tox

Expand Down
4 changes: 4 additions & 0 deletions .yamllint
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
---
extends: default

rules:
line-length: disable

ignore: |
.tox
5 changes: 5 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,11 @@ in 2018 by Paul Kremer.

## Changes

### vxx

* Add support for ansible 2.10
* Upgrade molecule to 3.x

### v4.0.0

* Drop support for ansible <=2.7
Expand Down
File renamed without changes.
9 changes: 3 additions & 6 deletions molecule/default/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@ dependency:
role-file: requirements.yml
driver:
name: docker
lint:
name: yamllint
lint: |
yamllint .
ansible-lint
platforms:
- name: lynis-ubuntu-1604
image: ubuntu:16.04
Expand All @@ -22,11 +23,7 @@ platforms:
image: debian:buster
provisioner:
name: ansible
lint:
name: ansible-lint
scenario:
name: default
verifier:
name: testinfra
lint:
name: flake8
4 changes: 3 additions & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
ansible-lint==4.3.5
molecule==2.22
molecule==3.0.8
# needed in this case because we run tests with docker containers:
docker==4.3.1
# molecule does not depend explicitly on testinfra anymore:
testinfra>=3.0.4
8 changes: 4 additions & 4 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tox]
minversion = 1.8
envlist = py{36}-ansible{28,29}
envlist = py{36}-ansible{28,29,210}
skipsdist = true

[testenv]
Expand All @@ -9,10 +9,9 @@ basepython = python3
passenv = *
deps =
-rrequirements.txt
# https://github.com/ansible/molecule/issues/1727
ansible28: testinfra>=3.0.4
ansible28: ansible>=2.8,<2.9
ansible29: ansible>=2.9,<2.10
ansible210: ansible>=2.10,<2.11
commands =
pip list
molecule --version
Expand All @@ -22,9 +21,10 @@ commands =

[travis]
os =
linux: py{36}-ansible{28,29}
linux: py{36}-ansible{28,29,210}

[travis:env]
ANSIBLE =
2.8: ansible28
2.9: ansible29
2.10: ansible210

0 comments on commit a732dcb

Please sign in to comment.