Merge pull request #774 from moreati/distro-vs-distros

tests: Correct DISTRO vs DISTROS usage in CI configurations

.ci/azure-pipelines.yml

@@ -17,7 +17,6 @@ jobs:
       Mito27_27:
         python.version: '2.7'
         MODE: mitogen
-        VER: 2.10.0
       # TODO: test python3, python3 tests are broken
       Ans210_27:
         python.version: '2.7'
@@ -47,7 +46,6 @@ jobs:
         python.version: '2.7'
         MODE: mitogen
         DISTRO: debian
-        VER: 2.10.0
 
       #MitoPy27CentOS6_26:
         #python.version: '2.7'
@@ -58,13 +56,11 @@ jobs:
         python.version: '3.6'
         MODE: mitogen
         DISTRO: centos6
-        VER: 2.10.0
 
       Mito37Debian_27:
         python.version: '3.7'
         MODE: mitogen
         DISTRO: debian
-        VER: 2.10.0
 
       Mito39Debian_27:
         python.version: '3.9'

.ci/ci_lib.py

@@ -217,9 +217,12 @@ class Fold(object):
 
 os.environ.setdefault('ANSIBLE_STRATEGY',
     os.environ.get('STRATEGY', 'mitogen_linear'))
+# Ignoreed when MODE=mitogen
 ANSIBLE_VERSION = os.environ.get('VER', '2.6.2')
 GIT_ROOT = os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))
+# Used only when MODE=mitogen
 DISTRO = os.environ.get('DISTRO', 'debian')
+# Used only when MODE=ansible
 DISTROS = os.environ.get('DISTROS', 'debian centos6 centos7').split()
 TARGET_COUNT = int(os.environ.get('TARGET_COUNT', '2'))
 BASE_PORT = 2200

.travis.yml

@@ -74,13 +74,13 @@ matrix:
     #- python: "2.7"
       #env: MODE=mitogen DISTRO=centos6
     - python: "3.6"
-      env: MODE=mitogen DISTROS=centos7 VER=2.10.0
+      env: MODE=mitogen DISTRO=centos7
     - python: "3.9"
-      env: MODE=mitogen DISTROS=centos7 VER=2.10.0
+      env: MODE=mitogen DISTRO=centos7
     # 2.6 -> 2.7
     # - python: "2.6"
-    #   env: MODE=mitogen DISTROS=centos7 VER=2.10.0
+    #   env: MODE=mitogen DISTRO=centos7
     # 2.6 -> 3.5
     # - python: "2.6"
-    #   env: MODE=mitogen DISTROS=debian-py3 VER=2.10.0
+    #   env: MODE=mitogen DISTRO=debian-py3
     # 3.6 -> 2.6 -- moved to Azure

tests/doas_test.py

@@ -28,7 +28,7 @@ class ConstructorTest(testlib.RouterMixin, testlib.TestCase):
         self.assertEquals('1', context.call(os.getenv, 'THIS_IS_STUB_DOAS'))
 
 
-# TODO: https://github.com/dw/mitogen/issues/694 they are flaky on python 2.6 MODE=mitogen DISTRO=centos7
+# TODO: https://github.com/dw/mitogen/issues/694 they are flaky on python 2.6 MODE=mitogen DISTROS=centos7
 # class DoasTest(testlib.DockerMixin, testlib.TestCase):
 #     # Only mitogen/debian-test has doas.
 #     mitogen_test_distro = 'debian'