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
This commit is contained in:
parent
529d2a2133
commit
af6a5b53d0
21
osci.yaml
21
osci.yaml
@ -1,17 +1,23 @@
|
|||||||
- project:
|
- project:
|
||||||
templates:
|
templates:
|
||||||
- charm-unit-jobs
|
- charm-yoga-unit-jobs
|
||||||
check:
|
check:
|
||||||
jobs:
|
jobs:
|
||||||
- charm-build
|
- charm-build
|
||||||
- bionic-queens-40_trilio-horizon
|
- bionic-queens-40_trilio-horizon
|
||||||
- bionic-stein-40_trilio-horizon
|
- bionic-stein-40_trilio-horizon
|
||||||
- bionic-train-40_trilio-horizon
|
|
||||||
- bionic-queens-41_trilio-horizon
|
- bionic-queens-41_trilio-horizon
|
||||||
- bionic-stein-41_trilio-horizon
|
- bionic-stein-41_trilio-horizon
|
||||||
- bionic-train-41_trilio-horizon
|
# Non-voting due to:
|
||||||
- bionic-ussuri-41_trilio-horizon
|
# https://bugs.launchpad.net/charm-trilio-data-mover/+bug/1951999
|
||||||
- focal-ussuri-41_trilio-horizon
|
- 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:
|
vars:
|
||||||
needs_charm_build: true
|
needs_charm_build: true
|
||||||
charm_build_name: trilio-horizon-plugin
|
charm_build_name: trilio-horizon-plugin
|
||||||
@ -20,10 +26,9 @@
|
|||||||
parent: func-target
|
parent: func-target
|
||||||
dependencies:
|
dependencies:
|
||||||
- osci-lint
|
- osci-lint
|
||||||
- tox-py35
|
|
||||||
- tox-py36
|
- tox-py36
|
||||||
- tox-py37
|
|
||||||
- tox-py38
|
- tox-py38
|
||||||
|
- tox-py39
|
||||||
vars:
|
vars:
|
||||||
tox_extra_args: bionic-train-40
|
tox_extra_args: bionic-train-40
|
||||||
- job:
|
- job:
|
||||||
@ -68,4 +73,4 @@
|
|||||||
parent: func-target
|
parent: func-target
|
||||||
dependencies: *smoke-jobs
|
dependencies: *smoke-jobs
|
||||||
vars:
|
vars:
|
||||||
tox_extra_args: focal-ussuri-41
|
tox_extra_args: focal-ussuri-41
|
||||||
|
@ -9,6 +9,7 @@
|
|||||||
setuptools<50.0.0 # https://github.com/pypa/setuptools/commit/04e3df22df840c6bb244e9b27bc56750c44b7c85
|
setuptools<50.0.0 # https://github.com/pypa/setuptools/commit/04e3df22df840c6bb244e9b27bc56750c44b7c85
|
||||||
|
|
||||||
# Build requirements
|
# Build requirements
|
||||||
|
cffi==1.14.6; python_version < '3.6' # cffi 1.15.0 drops support for py35.
|
||||||
charm-tools==2.8.3
|
charm-tools==2.8.3
|
||||||
|
|
||||||
simplejson
|
simplejson
|
||||||
|
@ -14,10 +14,8 @@ tags:
|
|||||||
- backup
|
- backup
|
||||||
subordinate: true
|
subordinate: true
|
||||||
series:
|
series:
|
||||||
- xenial
|
|
||||||
- bionic
|
- bionic
|
||||||
- focal
|
- focal
|
||||||
- groovy
|
|
||||||
requires:
|
requires:
|
||||||
dashboard-plugin:
|
dashboard-plugin:
|
||||||
interface: dashboard-plugin
|
interface: dashboard-plugin
|
||||||
|
@ -22,12 +22,12 @@ skip_missing_interpreters = False
|
|||||||
requires = pip < 20.3
|
requires = pip < 20.3
|
||||||
virtualenv < 20.0
|
virtualenv < 20.0
|
||||||
# NOTE: https://wiki.canonical.com/engineering/OpenStack/InstallLatestToxOnOsci
|
# NOTE: https://wiki.canonical.com/engineering/OpenStack/InstallLatestToxOnOsci
|
||||||
minversion = 3.2.0
|
minversion = 3.18.0
|
||||||
|
|
||||||
[testenv]
|
[testenv]
|
||||||
setenv = VIRTUAL_ENV={envdir}
|
setenv = VIRTUAL_ENV={envdir}
|
||||||
PYTHONHASHSEED=0
|
PYTHONHASHSEED=0
|
||||||
whitelist_externals = juju
|
allowlist_externals = juju
|
||||||
passenv = HOME TERM CS_* OS_* TEST_*
|
passenv = HOME TERM CS_* OS_* TEST_*
|
||||||
deps = -r{toxinidir}/test-requirements.txt
|
deps = -r{toxinidir}/test-requirements.txt
|
||||||
install_command =
|
install_command =
|
||||||
|
@ -3,6 +3,8 @@
|
|||||||
# choices of *requirements.txt files for OpenStack Charms:
|
# choices of *requirements.txt files for OpenStack Charms:
|
||||||
# https://github.com/openstack-charmers/release-tools
|
# 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
|
setuptools<50.0.0 # https://github.com/pypa/setuptools/commit/04e3df22df840c6bb244e9b27bc56750c44b7c85
|
||||||
|
|
||||||
stestr>=2.2.0
|
stestr>=2.2.0
|
||||||
|
5
tox.ini
5
tox.ini
@ -75,6 +75,11 @@ basepython = python3.8
|
|||||||
deps = -r{toxinidir}/test-requirements.txt
|
deps = -r{toxinidir}/test-requirements.txt
|
||||||
commands = stestr run --slowest {posargs}
|
commands = stestr run --slowest {posargs}
|
||||||
|
|
||||||
|
[testenv:py39]
|
||||||
|
basepython = python3.9
|
||||||
|
deps = -r{toxinidir}/test-requirements.txt
|
||||||
|
commands = stestr run --slowest {posargs}
|
||||||
|
|
||||||
[testenv:pep8]
|
[testenv:pep8]
|
||||||
basepython = python3
|
basepython = python3
|
||||||
deps = flake8==3.9.2
|
deps = flake8==3.9.2
|
||||||
|
Loading…
Reference in New Issue
Block a user