Merge "Add yoga bundles and release-tool syncs"

osci.yaml

@@ -1,17 +1,25 @@
 - project:
     templates:
-      - charm-unit-jobs
+      - charm-yoga-unit-jobs
     check:
       jobs:
       - charm-build
+      # Non-voting due to:
+      # https://bugs.launchpad.net/charm-trilio-dm-api/+bug/1952663
       - bionic-queens-40_trilio-api
-      - bionic-stein-40_trilio-api
+      - bionic-stein-40_trilio-api:
+          voting: false
+      - bionic-queens-41_trilio-api
+      - bionic-stein-41_trilio-api:
+          voting: false
       - bionic-train-40_trilio-api
       - bionic-ussuri-40_trilio-api
-      - bionic-queens-41_trilio-api
-      - bionic-stein-41_trilio-api
-      - bionic-train-41_trilio-api
-      - bionic-ussuri-41_trilio-api
+      # Non-voting due to:
+      # https://bugs.launchpad.net/charm-trilio-data-mover/+bug/1951999
+      - bionic-train-41_trilio-api:
+          voting: false
+      - bionic-ussuri-41_trilio-api:
+          voting: false
     vars:
       needs_charm_build: true
       charm_build_name: trilio-dm-api
@@ -20,10 +28,9 @@
     parent: func-target
     dependencies:
       - osci-lint
-      - tox-py35
       - tox-py36
-      - tox-py37
       - tox-py38
+      - tox-py39
     vars:
       tox_extra_args: bionic-train-40
 - job:
@@ -70,4 +77,4 @@
     parent: func-target
     dependencies: *smoke-jobs
     vars:
-      tox_extra_args: bionic-ussuri-41
+      tox_extra_args: bionic-ussuri-41

requirements.txt

@@ -9,6 +9,7 @@
 setuptools<50.0.0  # https://github.com/pypa/setuptools/commit/04e3df22df840c6bb244e9b27bc56750c44b7c85
 
 # Build requirements
+cffi==1.14.6; python_version < '3.6'  # cffi 1.15.0 drops support for py35.
 charm-tools==2.8.3
 
 simplejson

src/metadata.yaml

@@ -16,7 +16,5 @@ provides:
   dm-api:
     interface: dm-api
 series:
-- xenial
 - bionic
 - focal
-- groovy

src/tox.ini

@@ -22,12 +22,12 @@ skip_missing_interpreters = False
 requires = pip < 20.3
            virtualenv < 20.0
 # NOTE: https://wiki.canonical.com/engineering/OpenStack/InstallLatestToxOnOsci
-minversion = 3.2.0
+minversion = 3.18.0
 
 [testenv]
 setenv = VIRTUAL_ENV={envdir}
          PYTHONHASHSEED=0
-whitelist_externals = juju
+allowlist_externals = juju
 passenv = HOME TERM CS_* OS_* TEST_*
 deps = -r{toxinidir}/test-requirements.txt
 install_command =

test-requirements.txt

@@ -3,6 +3,8 @@
 # choices of *requirements.txt files for OpenStack Charms:
 #     https://github.com/openstack-charmers/release-tools
 #
+pyparsing<3.0.0  # aodhclient is pinned in zaza and needs pyparsing < 3.0.0, but cffi also needs it, so pin here.
+cffi==1.14.6; python_version < '3.6'  # cffi 1.15.0 drops support for py35.
 setuptools<50.0.0  # https://github.com/pypa/setuptools/commit/04e3df22df840c6bb244e9b27bc56750c44b7c85
 
 stestr>=2.2.0

tox.ini

@@ -75,6 +75,11 @@ basepython = python3.8
 deps = -r{toxinidir}/test-requirements.txt
 commands = stestr run --slowest {posargs}
 
+[testenv:py39]
+basepython = python3.9
+deps = -r{toxinidir}/test-requirements.txt
+commands = stestr run --slowest {posargs}
+
 [testenv:pep8]
 basepython = python3
 deps = flake8==3.9.2