From 6f28e11618674decb1f24e74886b1c95bb3f6808 Mon Sep 17 00:00:00 2001
From: Alex Willmer <alex@moreati.org.uk>
Date: Sun, 21 Feb 2021 20:56:59 +0000
Subject: [PATCH] tests: Add Tox environments for debian 10, 11; centos 8;
 ubuntu

---
 tox.ini | 56 ++++++++++++++++++++++++++++++++++++++++++++------------
 1 file changed, 44 insertions(+), 12 deletions(-)

diff --git a/tox.ini b/tox.ini
index 3227672f..eda4e567 100644
--- a/tox.ini
+++ b/tox.ini
@@ -9,18 +9,29 @@
 
 # Last version to support each python version
 #
-#            tox      vir'env  pip      ansible  coverage
-# ========== ======== ======== ======== ======== ========
-# python2.4  1.4      1.8      1.1      ???
+#            tox      vir'env  pip      ansible  ansible  coverage
+#                                       control  target
+# ========== ======== ======== ======== ======== ======== ========
+# python2.4  1.4      1.8      1.1               2.3?
 # python2.5  1.6.1    1.9.1    1.3.1    ???
-# python2.6  2.9.1    15.2.0   9.0.3    2.6.20   4.5.4
+# python2.6  2.9.1    15.2.0   9.0.3    2.6.20            4.5.4
+# python2.7                    20.3     2.10
+# python3.5                             2.10
+# python3.6                             2.10
+# python3.7                             2.10
+
+# pip --no-python-version-warning
+# pip --disable-pip-version-check
 
 [tox]
 envlist =
     init,
-    py{27,36,39}-mode_ansible-ansible2.10,
-    py{27,36,39}-mode_mitogen,
-    py{27,36,39}-mode_mitogen-distro_centos7,
+    py{27,35,39}-mode_ansible-distros_centos,
+    py{27,35,39}-mode_ansible-distros_debian,
+    py{27,35,39}-mode_ansible-distros_ubuntu,
+    py{27,35,39}-mode_mitogen-distro_centos{6,7,8},
+    py{27,35,39}-mode_mitogen-distro_debian{9,10,11},
+    py{27,35,39}-mode_mitogen-distro_ubuntu{1604,1804,2004},
     report,
 requires =
     tox-factor
@@ -29,24 +40,29 @@ requires =
 basepython =
     py26: python2.6
     py27: python2.7
+    py35: python3.5
     py36: python3.6
     py37: python3.7
     py38: python3.8
     py39: python3.9
+install_command =
+    python -m pip --no-python-version-warning install {opts} {packages}
 commands_pre =
     mode_ansible: {toxinidir}/.ci/ansible_install.py
     mode_debops_common: {toxinidir}/.ci/debops_common_install.py
     mode_mitogen: {toxinidir}/.ci/mitogen_install.py
 commands =
-    mode_ansible: {toxinidir}/.ci/ansible_tests.py \
-                        --skip-tags requires_local_sudo
+    mode_ansible: {toxinidir}/.ci/ansible_tests.py
     mode_debops_common: {toxinidir}/.ci/debops_common_tests.py
     mode_mitogen: {toxinidir}/.ci/mitogen_tests.py
 passenv =
+    ANSIBLE_*
     HOME
 setenv =
+    ANSIBLE_SKIP_TAGS = requires_local_sudo
     NOCOVERAGE_ERASE = 1
     NOCOVERAGE_REPORT = 1
+    VER=2.10.5
     ansible2.3: VER=2.3.3.0
     ansible2.4: VER=2.4.6.0
     ansible2.8: VER=2.8.3
@@ -55,10 +71,26 @@ setenv =
     distro_centos5: DISTRO=centos5
     distro_centos6: DISTRO=centos6
     distro_centos7: DISTRO=centos7
-    distro_debian: DISTRO=debian
-    distro_debianpy3: DISTRO=debian-py3
+    distro_centos8: DISTRO=centos8
+    distro_debian9: DISTRO=debian9
+    distro_debian10: DISTRO=debian10
+    distro_debian11: DISTRO=debian11
+    distro_ubuntu1604: DISTRO=ubuntu1604
+    distro_ubuntu1804: DISTRO=ubuntu1804
+    distro_ubuntu2004: DISTRO=ubuntu2004
+    distros_centos: DISTROS=centos6 centos7 centos8
     distros_centos5: DISTROS=centos5
-    distros_debian: DISTROS=debian
+    distros_centos6: DISTROS=centos6
+    distros_centos7: DISTROS=centos7
+    distros_centos8: DISTROS=centos8
+    distros_debian: DISTROS=debian9 debian10 debian11
+    distros_debian9: DISTROS=debian9
+    distros_debian10: DISTROS=debian10
+    distros_debian11: DISTROS=debian11
+    distros_ubuntu: DISTROS=ubuntu1604 ubuntu1804 ubuntu2004
+    distros_ubuntu1604: DISTROS=ubuntu1604
+    distros_ubuntu1804: DISTROS=ubuntu1804
+    distros_ubuntu2004: DISTROS=ubuntu2004
     mode_ansible: MODE=ansible
     mode_debops_common: MODE=debops_common
     mode_mitogen: MODE=mitogen