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: I33a8831474633c5516a956fec86d13e333a03b76
This commit is contained in:
Corey Bryant
parent
1c35d6287a
commit
9a0782a8a8
20
osci.yaml
20
osci.yaml
|
|
@ -1,19 +1,11 @@
|
|||
- project:
|
||||
templates:
|
||||
- charm-unit-jobs
|
||||
check:
|
||||
jobs:
|
||||
- bionic-train
|
||||
- bionic-ussuri
|
||||
- focal-ussuri
|
||||
- focal-victoria
|
||||
- focal-wallaby
|
||||
- focal-xena:
|
||||
voting: false
|
||||
- groovy-victoria
|
||||
- hirsute-wallaby
|
||||
- impish-xena:
|
||||
voting: false
|
||||
- charm-yoga-unit-jobs
|
||||
- charm-yoga-functional-jobs
|
||||
- charm-xena-functional-jobs
|
||||
- charm-wallaby-functional-jobs
|
||||
- charm-victoria-functional-jobs
|
||||
- charm-ussuri-functional-jobs
|
||||
vars:
|
||||
needs_charm_build: true
|
||||
charm_build_name: ovn-dedicated-chassis
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -0,0 +1,78 @@
|
|||
variables:
|
||||
openstack-origin: &openstack-origin cloud:focal-yoga
|
||||
|
||||
series: focal
|
||||
|
||||
comment:
|
||||
- 'machines section to decide order of deployment. database sooner = faster'
|
||||
machines:
|
||||
'0':
|
||||
constraints: mem=3072M
|
||||
'1':
|
||||
constraints: mem=3072M
|
||||
'2':
|
||||
constraints: mem=3072M
|
||||
'3':
|
||||
'4':
|
||||
'5':
|
||||
'6':
|
||||
'7':
|
||||
'8':
|
||||
|
||||
applications:
|
||||
|
||||
vault-mysql-router:
|
||||
charm: cs:~openstack-charmers-next/mysql-router
|
||||
|
||||
mysql-innodb-cluster:
|
||||
charm: cs:~openstack-charmers-next/mysql-innodb-cluster
|
||||
num_units: 3
|
||||
options:
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '0'
|
||||
- '1'
|
||||
- '2'
|
||||
|
||||
vault:
|
||||
charm: cs:~openstack-charmers-next/vault
|
||||
num_units: 1
|
||||
to:
|
||||
- '3'
|
||||
|
||||
ovn-central:
|
||||
charm: cs:~openstack-charmers-next/ovn-central
|
||||
num_units: 3
|
||||
options:
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '4'
|
||||
- '5'
|
||||
- '6'
|
||||
|
||||
nrpe:
|
||||
charm: cs:nrpe
|
||||
|
||||
ovn-dedicated-chassis:
|
||||
charm: cs:~openstack-charmers-next/ovn-dedicated-chassis
|
||||
num_units: 2
|
||||
options:
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '7'
|
||||
- '8'
|
||||
|
||||
relations:
|
||||
|
||||
- - 'vault-mysql-router:db-router'
|
||||
- 'mysql-innodb-cluster:db-router'
|
||||
- - 'vault:shared-db'
|
||||
- 'vault-mysql-router:shared-db'
|
||||
- - 'ovn-central:certificates'
|
||||
- 'vault:certificates'
|
||||
- - 'ovn-dedicated-chassis:ovsdb'
|
||||
- 'ovn-central:ovsdb'
|
||||
- - 'ovn-dedicated-chassis:certificates'
|
||||
- 'vault:certificates'
|
||||
- - 'ovn-dedicated-chassis:nrpe-external-master'
|
||||
- 'nrpe:nrpe-external-master'
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
variables:
|
||||
openstack-origin: &openstack-origin distro
|
||||
|
||||
series: groovy
|
||||
series: jammy
|
||||
|
||||
comment:
|
||||
- 'machines section to decide order of deployment. database sooner = faster'
|
||||
|
|
@ -1,20 +1,21 @@
|
|||
charm_name: ovn-dedicated-chassis
|
||||
|
||||
gate_bundles:
|
||||
- bionic-train
|
||||
- bionic-ussuri
|
||||
- focal-ussuri
|
||||
- focal-victoria
|
||||
- focal-wallaby
|
||||
- groovy-victoria
|
||||
- focal-xena
|
||||
- hirsute-wallaby
|
||||
- impish-xena
|
||||
|
||||
smoke_bundles:
|
||||
- focal-ussuri
|
||||
|
||||
dev_bundles:
|
||||
- focal-xena
|
||||
- impish-xena
|
||||
- bionic-train
|
||||
- focal-yoga
|
||||
- jammy-yoga
|
||||
|
||||
target_deploy_status:
|
||||
ovn-central:
|
||||
|
|
@ -39,6 +40,6 @@ tests:
|
|||
|
||||
tests_options:
|
||||
force_deploy:
|
||||
- groovy-victoria # workaround for lp:1933643
|
||||
- hirsute-wallaby # because of nrpe charm not supporting hirsute
|
||||
- impish-xena
|
||||
- hirsute-wallaby # workaround for lp:1933643
|
||||
- impish-xena # because of nrpe charm not supporting hirsute
|
||||
- jammy-yoga
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
5
tox.ini
5
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
|
||||
|
|
|
|||
Loading…
Reference in New Issue