Merge pull request #869 from moreati/azure-tox

ci: Switch Continuous Integration to Tox

Author: moreati

.ci/README.md

@@ -28,8 +28,6 @@ for doing `setup.py install` while pulling a Docker container, for example.
 
 ### Environment Variables
 
-* `VER`: Ansible version the `_install` script should install. Default changes
-  over time.
 * `TARGET_COUNT`: number of targets for `debops_` run. Defaults to 2.
 * `DISTRO`: the `mitogen_` tests need a target Docker container distro. This
   name comes from the Docker Hub `mitogen` user, i.e. `mitogen/$DISTRO-test`

.ci/ansible_install.py

@@ -3,21 +3,9 @@
 import ci_lib
 
 batches = [
-    [
-        'pip install '
-            '-r tests/requirements.txt '
-            '-r tests/ansible/requirements.txt',
-        # encoding is required for installing ansible 2.10 with pip2, otherwise we get a UnicodeDecode error
-        'LC_CTYPE=en_US.UTF-8 LANG=en_US.UTF-8 pip install "ansible-base<2.10.14" "ansible=={}"'.format(ci_lib.ANSIBLE_VERSION)
-    ],
     [
         'aws ecr-public get-login-password | docker login --username AWS --password-stdin public.ecr.aws',
     ]
 ]
 
-batches[-1].extend([
-    'docker pull %s' % (ci_lib.image_for_distro(distro),)
-    for distro in ci_lib.DISTROS
-])
-
 ci_lib.run_batches(batches)

.ci/azure-pipelines-steps.yml

@@ -5,20 +5,17 @@ parameters:
   sign: false
 
 steps:
-- script: "PYTHONVERSION=$(python.version) .ci/prep_azure.py"
-  displayName: "Run prep_azure.py"
+- task: UsePythonVersion@0
+  displayName: Install python
+  inputs:
+    versionSpec: '$(python.version)'
 
-- script: |
-    echo "##vso[task.prependpath]/tmp/venv/bin"
+- script: python -mpip install tox
+  displayName: Install tooling
 
-  displayName: activate venv
-
-- script: .ci/$(MODE)_install.py
-  displayName: "Run $(MODE)_install.py"
+- script: tox -e $(tox.env)
+  displayName: "Run tests"
   env:
     AWS_ACCESS_KEY_ID: $(AWS_ACCESS_KEY_ID)
     AWS_SECRET_ACCESS_KEY: $(AWS_SECRET_ACCESS_KEY)
     AWS_DEFAULT_REGION: $(AWS_DEFAULT_REGION)
-
-- script: .ci/$(MODE)_tests.py
-  displayName: "Run $(MODE)_tests.py"

.ci/azure-pipelines.yml

@@ -16,62 +16,46 @@ jobs:
   steps:
   - template: azure-pipelines-steps.yml
   pool:
+    # https://github.com/actions/virtual-environments/blob/main/images/macos/macos-10.15-Readme.md
     vmImage: macOS-10.15
   strategy:
     matrix:
       Mito27_27:
         python.version: '2.7'
-        MODE: mitogen
+        tox.env: py27-mode_mitogen
+
       # TODO: test python3, python3 tests are broken
       Ans210_27:
         python.version: '2.7'
-        MODE: localhost_ansible
-        VER: 2.10.0
+        tox.env: py27-mode_localhost-ansible2.10
 
       # NOTE: this hangs when ran in Ubuntu 18.04
       Vanilla_210_27:
         python.version: '2.7'
-        MODE: localhost_ansible
-        VER: 2.10.0
+        tox.env: py27-mode_localhost-ansible2.10
         STRATEGY: linear
         ANSIBLE_SKIP_TAGS: resource_intensive
 
 
 - job: Linux
   pool:
+    # https://github.com/actions/virtual-environments/blob/main/images/linux/Ubuntu1804-README.md
     vmImage: "Ubuntu 18.04"
   steps:
   - template: azure-pipelines-steps.yml
   strategy:
     matrix:
-      #
-      # Confirmed working
-      #
       Mito27Debian_27:
         python.version: '2.7'
-        MODE: mitogen
-        DISTRO: debian9
-
-      #MitoPy27CentOS6_26:
-        #python.version: '2.7'
-        #MODE: mitogen
-        #DISTRO: centos6
+        tox.env: py27-mode_mitogen-distro_debian9
 
       Mito36CentOS6_26:
         python.version: '3.6'
-        MODE: mitogen
-        DISTRO: centos6
-
-      Mito37Debian_27:
-        python.version: '3.7'
-        MODE: mitogen
-        DISTRO: debian9
+        tox.env: py36-mode_mitogen-distro_centos6
 
       Mito39Debian_27:
         python.version: '3.9'
-        MODE: mitogen
-        DISTRO: debian9
-        VER: 2.10.0
+        tox.env: py39-mode_mitogen-distro_debian9
 
       #Py26CentOS7:
         #python.version: '2.7'
@@ -117,15 +101,12 @@ jobs:
 
       Ansible_210_27:
         python.version: '2.7'
-        MODE: ansible
-        VER: 2.10.0
+        tox.env: py27-mode_ansible-ansible2.10
 
-      Ansible_210_35:
-        python.version: '3.5'
-        MODE: ansible
-        VER: 2.10.0
+      Ansible_210_36:
+        python.version: '3.6'
+        tox.env: py36-mode_ansible-ansible2.10
 
       Ansible_210_39:
         python.version: '3.9'
-        MODE: ansible
-        VER: 2.10.0
+        tox.env: py39-mode_ansible-ansible2.10

.ci/ci_lib.py

@@ -59,12 +59,6 @@ def have_docker():
     return proc.wait() == 0
 
 
-# -----------------
-
-# Force line buffering on stdout.
-sys.stdout = os.fdopen(1, 'w', 1)
-
-
 def _argv(s, *args):
     """Interpolate a command line using *args, return an argv style list.
 
@@ -195,13 +189,11 @@ def __exit__(self, _1, _2, _3): pass
 
 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')
+DISTRO = os.environ.get('DISTRO', 'debian9')
 # Used only when MODE=ansible
-DISTROS = os.environ.get('DISTROS', 'debian centos6 centos7').split()
+DISTROS = os.environ.get('DISTROS', 'centos6 centos8 debian9 debian11 ubuntu1604 ubuntu2004').split()
 TARGET_COUNT = int(os.environ.get('TARGET_COUNT', '2'))
 BASE_PORT = 2200
 TMP = TempDir().path
@@ -254,11 +246,13 @@ def make_containers(name_prefix='', port_offset=0):
     >>> pprint.pprint(make_containers())
     [{'distro': 'debian',
       'hostname': 'localhost',
+      'image': 'public.ecr.aws/n5z0e8q9/debian-test',
       'name': 'target-debian-1',
       'port': 2201,
       'python_path': '/usr/bin/python'},
      {'distro': 'centos6',
       'hostname': 'localhost',
+      'image': 'public.ecr.aws/n5z0e8q9/centos6-test',
       'name': 'target-centos6-2',
       'port': 2202,
       'python_path': '/usr/bin/python'}]
@@ -280,6 +274,7 @@ def make_containers(name_prefix='', port_offset=0):
         for x in range(count):
             lst.append({
                 "distro": firstbit(distro),
+                "image": image_for_distro(distro),
                 "name": name_prefix + ("target-%s-%s" % (distro, i)),
                 "hostname": docker_hostname,
                 "port": BASE_PORT + i + port_offset,
@@ -358,7 +353,7 @@ def start_containers(containers):
                 "--publish 0.0.0.0:%(port)s:22/tcp "
                 "--hostname=%(name)s "
                 "--name=%(name)s "
-                "mitogen/%(distro)s-test "
+                "%(image)s"
             % container
         ]
         for container in containers

.ci/debops_common_install.py

@@ -7,11 +7,10 @@
 
 ci_lib.run_batches([
     [
-        'pip install -qqq "debops[ansible]==2.1.2" "ansible-base<2.10.14" "ansible=={}"'.format(ci_lib.ANSIBLE_VERSION),
+        'pip install -qqq "debops[ansible]==2.1.2"',
     ],
     [
         'aws ecr-public get-login-password | docker login --username AWS --password-stdin public.ecr.aws',
-        'docker pull %s' % (ci_lib.image_for_distro('debian'),),
     ],
 ])
 

.ci/localhost_ansible_install.py

@@ -3,12 +3,6 @@
 import ci_lib
 
 batches = [
-    [
-        'pip install '
-            '-r tests/requirements.txt '
-            '-r tests/ansible/requirements.txt',
-        'pip install -q "ansible-base<2.10.14" "ansible=={}"'.format(ci_lib.ANSIBLE_VERSION)
-    ]
 ]
 
 ci_lib.run_batches(batches)

.ci/mitogen_install.py

@@ -3,15 +3,11 @@
 import ci_lib
 
 batches = [
-    [
-        'pip install -r tests/requirements.txt',
-    ]
 ]
 
 if ci_lib.have_docker():
     batches.append([
         'aws ecr-public get-login-password | docker login --username AWS --password-stdin public.ecr.aws',
-        'docker pull %s' % (ci_lib.image_for_distro(ci_lib.DISTRO),),
     ])
 
 

.ci/mitogen_py24_install.py

@@ -5,7 +5,6 @@
 batches = [
     [
         'aws ecr-public get-login-password | docker login --username AWS --password-stdin public.ecr.aws',
-        'docker pull %s' % (ci_lib.image_for_distro(ci_lib.DISTRO),),
     ],
     [
         'curl https://dw.github.io/mitogen/binaries/ubuntu-python-2.4.6.tar.bz2 | sudo tar -C / -jxv',