ansible major version now in tox env name pattern

ansible-community · Oct 5, 2021 · e95dd95 · e95dd95
1 parent e8917c7
commit e95dd95
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 20 deletions.
diff --git a/.github/workflows/tox.yml b/.github/workflows/tox.yml
@@ -25,27 +25,27 @@ jobs:
         include:
           - tox_env: lint
           # - tox_env: docs
-          - tox_env: py36
+          - tox_env: py36-ansible_2
             PREFIX: PYTEST_REQPASS=2
             PYTHON_BASE_IMAGE: python:3.6
             KUBERNETES_VERSION: v1.22.2
-          - tox_env: py36-devel
+          - tox_env: py36-ansible_2-devel
             PREFIX: PYTEST_REQPASS=2
             PYTHON_BASE_IMAGE: python:3.6
             KUBERNETES_VERSION: v1.22.2
-          - tox_env: py37
+          - tox_env: py37-ansible_3
             PREFIX: PYTEST_REQPASS=2
             PYTHON_BASE_IMAGE: python:3.7
             KUBERNETES_VERSION: v1.22.2
-          - tox_env: py38
+          - tox_env: py38-ansible_4
             PREFIX: PYTEST_REQPASS=2
             PYTHON_BASE_IMAGE: python:3.8
             KUBERNETES_VERSION: v1.22.2
-          - tox_env: py39
+          - tox_env: py39-ansible_2
             PREFIX: PYTEST_REQPASS=2
             PYTHON_BASE_IMAGE: python:3.9
             KUBERNETES_VERSION: v1.22.2
-          - tox_env: py39-devel
+          - tox_env: py39-ansible_2-devel
             PREFIX: PYTEST_REQPASS=2
             PYTHON_BASE_IMAGE: python:3.9
             KUBERNETES_VERSION: v1.22.2

diff --git a/tox.ini b/tox.ini
@@ -4,8 +4,8 @@ envlist =
     lint
     docs
     packaging
-    py{36,37,38,39}
-    py{36,37,38,39}-{devel}
+    py{36,37,38,39}-{ansible_2,ansible_3,ansible_4}
+    py{36,37,38,39}-{ansible_2,ansible_3,ansible_4}-{devel}
 
 # do not enable skip missing to avoid CI false positives
 skip_missing_interpreters = False
@@ -35,25 +35,23 @@ setenv =
     # PIP_USE_FEATURE=2020-resolver
     MOLECULE_NO_LOG=0
 deps =
-    py{36}: ansible>=2.10,<2.11
-    py{37}: ansible>=3.0,<4.0
-    py{38}: ansible>=4.0,<5.0
-    py{39}: ansible>=2.10,<2.11
+    py{36,37,38,39}-{ansible_2}: ansible>=2.10
+    py{36,37,38,39}-{ansible_2}: openshift>=0.11,<0.12
+    py{36,37,38,39}-{ansible_2}: jmespath>=0.10.0
+    py{36,37,38,39}-{ansible_2}: kubernetes>=11,<12
+    py{36,37,38,39}-{ansible_2}: molecule[test]
 
-    py{36}-{devel}: ansible>=2.10,<3.0
-    py{39}-{devel}: ansible>=2.10,<3.0
+    py{36,37,38,39}-{ansible_3}: ansible>=3.0,<4.0
 
-    py{36,39}: openshift>=0.11,<0.12
-    py{36,39}: jmespath>=0.10.0
-    py{36,39}: kubernetes>=11,<12
-    py{36,39}: molecule[test]
-    py{36,39}-{devel}: git+https://github.com/ansible-community/molecule.git@main#egg=molecule[test]
+    py{36,37,38,39}-{ansible_4}: ansible>=4.0,<5.0
+
+    pypy{36,37,38,39}-{ansible_2,ansible_3,ansible_4}-{devel}: git+https://github.com/ansible-community/molecule.git@main#egg=molecule[test]
     selinux
 extras =
     lint
     test
 commands =
-    py{36,39}: ansible-galaxy install git+https://github.com/ansible-collections/community.general.git
+    py{36,37,38,39}-{ansible_2}: ansible-galaxy install git+https://github.com/ansible-collections/community.general.git
 
     # failsafe as pip may install incompatible dependencies
     pip check