From af6a5b53d0fcf580bcd572fc32d67aefc78fe184 Mon Sep 17 00:00:00 2001 From: Corey Bryant Date: Fri, 29 Oct 2021 17:00:43 -0400 Subject: [PATCH] Add yoga bundles and release-tool syncs * charm-helpers sync for classic charms * sync from release-tools * switch to release-specific zosci functional tests * run focal-ussuri as smoke tests * remove trusty, xenial, and groovy metadata/tests * drop py35 and add py39 Change-Id: Iaf03fec031aecd7fa89d36b6b2f4d385dd63397b --- osci.yaml | 21 +++++++++++++-------- requirements.txt | 1 + src/metadata.yaml | 2 -- src/tox.ini | 4 ++-- test-requirements.txt | 2 ++ tox.ini | 5 +++++ 6 files changed, 23 insertions(+), 12 deletions(-) diff --git a/osci.yaml b/osci.yaml index 83c3587..b3075cd 100644 --- a/osci.yaml +++ b/osci.yaml @@ -1,17 +1,23 @@ - project: templates: - - charm-unit-jobs + - charm-yoga-unit-jobs check: jobs: - charm-build - bionic-queens-40_trilio-horizon - bionic-stein-40_trilio-horizon - - bionic-train-40_trilio-horizon - bionic-queens-41_trilio-horizon - bionic-stein-41_trilio-horizon - - bionic-train-41_trilio-horizon - - bionic-ussuri-41_trilio-horizon - - focal-ussuri-41_trilio-horizon + # Non-voting due to: + # https://bugs.launchpad.net/charm-trilio-data-mover/+bug/1951999 + - bionic-train-40_trilio-horizon: + voting: false + - bionic-train-41_trilio-horizon: + voting: false + - bionic-ussuri-41_trilio-horizon: + voting: false + - focal-ussuri-41_trilio-horizon: + voting: false vars: needs_charm_build: true charm_build_name: trilio-horizon-plugin @@ -20,10 +26,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: @@ -68,4 +73,4 @@ parent: func-target dependencies: *smoke-jobs vars: - tox_extra_args: focal-ussuri-41 \ No newline at end of file + tox_extra_args: focal-ussuri-41 diff --git a/requirements.txt b/requirements.txt index b786b42..a68620f 100644 --- a/requirements.txt +++ b/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 diff --git a/src/metadata.yaml b/src/metadata.yaml index a550131..f11196a 100644 --- a/src/metadata.yaml +++ b/src/metadata.yaml @@ -14,10 +14,8 @@ tags: - backup subordinate: true series: -- xenial - bionic - focal -- groovy requires: dashboard-plugin: interface: dashboard-plugin diff --git a/src/tox.ini b/src/tox.ini index e763047..b40d295 100644 --- a/src/tox.ini +++ b/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 = diff --git a/test-requirements.txt b/test-requirements.txt index af069e1..bb1307f 100644 --- a/test-requirements.txt +++ b/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 diff --git a/tox.ini b/tox.ini index 22159df..faf6092 100644 --- a/tox.ini +++ b/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