From 32db1b5276f16da9cfb428940c29b1f62cbf5eee Mon Sep 17 00:00:00 2001 From: Robert de Bock Date: Thu, 7 Nov 2019 18:41:37 +0100 Subject: [PATCH] Correct in tox to test 3 versions of ansible. --- .travis.yml | 2 -- README.md | 6 ++---- tox.ini | 6 +++--- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7616644..a1cf7fc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,8 +30,6 @@ matrix: - env: image="alpine" tag="edge" - env: image="debian" tag="unstable" - env: image="fedora" tag="rawhide" - - env: image="ubuntu" tag="rolling" - - env: image="ubuntu" tag="devel" cache: - pip diff --git a/README.md b/README.md index 309eb9e..678f159 100644 --- a/README.md +++ b/README.md @@ -120,12 +120,10 @@ This role has been tested on these [container images](https://hub.docker.com/): This role has been tested on these Ansible versions: -- ansible~=2.8 -- ansible~=2.9 +- ansible>=2.8, <2.9 +- ansible>=2.9 - git+https://github.com/ansible/ansible.git@devel -The indicator '\~=' means [compatible with](https://www.python.org/dev/peps/pep-0440/#compatible-release). For example 'ansible\~=2.8' would pick the latest ansible-2.8, for example ansible-2.8.6. - Included version(s) ------------------- diff --git a/tox.ini b/tox.ini index e67f5f9..a0b5209 100644 --- a/tox.ini +++ b/tox.ini @@ -5,8 +5,8 @@ skipsdist = true [testenv] deps = - previous: ansible~=2.8 - current: ansible~=2.9 + previous: ansible>=2.8, <2.9 + current: ansible>=2.9 next: git+https://github.com/ansible/ansible.git@devel docker molecule @@ -14,5 +14,5 @@ commands = molecule test setenv = TOX_ENVNAME={envname} - MOLECULE_EPHEMERAL_DIRECTORY=/tmp/{envname} + MOLECULE_EPHEMERAL_DIRECTORY={toxinidir}/.tox/{envname} passenv = namespace image tag