x
/
charm-ovn-chassis
Code Issues Proposed changes

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: If83072b317624585251a23040e8a22e5aaead6c7
This commit is contained in:
Corey Bryant 2021-10-29 17:00:42 -04:00
parent 18c53e426f
commit 4ba4175d03
13 changed files with 464 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
osci.yaml
View File

@ -1,14 +1,11 @@
- project:
templates:
- charm-unit-jobs
check:
jobs:
- bionic-train
- bionic-ussuri
- focal
- hirsute
- impish:
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-chassis

4
src/tests/bundles/bionic-ussuri.yaml
View File

@ -25,12 +25,12 @@ applications:
charm: cs:~openstack-charmers-next/ovn-central
num_units: 3
options:
source: cloud:bionic-ussuri/proposed
source: cloud:bionic-ussuri
magpie:
charm: cs:~openstack-charmers-next/magpie
num_units: 2
options:
source: cloud:bionic-ussuri/proposed
source: cloud:bionic-ussuri
ovn-chassis:
series: bionic
charm: cs:~openstack-charmers-next/ovn-chassis

0
src/tests/bundles/focal.yaml → src/tests/bundles/focal-ussuri.yaml
View File

89
src/tests/bundles/focal-victoria.yaml Normal file
View File

@ -0,0 +1,89 @@
variables:
openstack-origin: &openstack-origin cloud:focal-victoria
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'
nrpe:
charm: cs:nrpe
series: focal
ovn-central:
charm: cs:~openstack-charmers-next/ovn-central
num_units: 3
options:
source: *openstack-origin
to:
- '4'
- '5'
- '6'
magpie:
charm: cs:~openstack-charmers-next/magpie
num_units: 2
to:
- '7'
- '8'
ovn-chassis:
charm: cs:~openstack-charmers-next/ovn-chassis
relations:
- - 'vault:shared-db'
- 'vault-mysql-router:shared-db'
- - 'vault-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'ovn-central:certificates'
- 'vault:certificates'
- - 'magpie:juju-info'
- 'ovn-chassis:juju-info'
- - 'ovn-chassis:ovsdb'
- 'ovn-central:ovsdb'
- - 'ovn-chassis:certificates'
- 'vault:certificates'
- - 'ovn-chassis:nrpe-external-master'
- 'nrpe:nrpe-external-master'
- - 'magpie:juju-info'
- 'nrpe:general-info'

89
src/tests/bundles/focal-wallaby.yaml Normal file
View File

@ -0,0 +1,89 @@
variables:
openstack-origin: &openstack-origin cloud:focal-wallaby
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'
nrpe:
charm: cs:nrpe
series: focal
ovn-central:
charm: cs:~openstack-charmers-next/ovn-central
num_units: 3
options:
source: *openstack-origin
to:
- '4'
- '5'
- '6'
magpie:
charm: cs:~openstack-charmers-next/magpie
num_units: 2
to:
- '7'
- '8'
ovn-chassis:
charm: cs:~openstack-charmers-next/ovn-chassis
relations:
- - 'vault:shared-db'
- 'vault-mysql-router:shared-db'
- - 'vault-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'ovn-central:certificates'
- 'vault:certificates'
- - 'magpie:juju-info'
- 'ovn-chassis:juju-info'
- - 'ovn-chassis:ovsdb'
- 'ovn-central:ovsdb'
- - 'ovn-chassis:certificates'
- 'vault:certificates'
- - 'ovn-chassis:nrpe-external-master'
- 'nrpe:nrpe-external-master'
- - 'magpie:juju-info'
- 'nrpe:general-info'

89
src/tests/bundles/focal-xena.yaml Normal file
View File

@ -0,0 +1,89 @@
variables:
openstack-origin: &openstack-origin cloud:focal-xena
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'
nrpe:
charm: cs:nrpe
series: focal
ovn-central:
charm: cs:~openstack-charmers-next/ovn-central
num_units: 3
options:
source: *openstack-origin
to:
- '4'
- '5'
- '6'
magpie:
charm: cs:~openstack-charmers-next/magpie
num_units: 2
to:
- '7'
- '8'
ovn-chassis:
charm: cs:~openstack-charmers-next/ovn-chassis
relations:
- - 'vault:shared-db'
- 'vault-mysql-router:shared-db'
- - 'vault-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'ovn-central:certificates'
- 'vault:certificates'
- - 'magpie:juju-info'
- 'ovn-chassis:juju-info'
- - 'ovn-chassis:ovsdb'
- 'ovn-central:ovsdb'
- - 'ovn-chassis:certificates'
- 'vault:certificates'
- - 'ovn-chassis:nrpe-external-master'
- 'nrpe:nrpe-external-master'
- - 'magpie:juju-info'
- 'nrpe:general-info'

89
src/tests/bundles/focal-yoga.yaml Normal file
View File

@ -0,0 +1,89 @@
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'
nrpe:
charm: cs:nrpe
series: focal
ovn-central:
charm: cs:~openstack-charmers-next/ovn-central
num_units: 3
options:
source: *openstack-origin
to:
- '4'
- '5'
- '6'
magpie:
charm: cs:~openstack-charmers-next/magpie
num_units: 2
to:
- '7'
- '8'
ovn-chassis:
charm: cs:~openstack-charmers-next/ovn-chassis
relations:
- - 'vault:shared-db'
- 'vault-mysql-router:shared-db'
- - 'vault-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'ovn-central:certificates'
- 'vault:certificates'
- - 'magpie:juju-info'
- 'ovn-chassis:juju-info'
- - 'ovn-chassis:ovsdb'
- 'ovn-central:ovsdb'
- - 'ovn-chassis:certificates'
- 'vault:certificates'
- - 'ovn-chassis:nrpe-external-master'
- 'nrpe:nrpe-external-master'
- - 'magpie:juju-info'
- 'nrpe:general-info'

0
src/tests/bundles/hirsute.yaml → src/tests/bundles/hirsute-wallaby.yaml
View File

0
src/tests/bundles/impish.yaml → src/tests/bundles/impish-xena.yaml
View File

89
src/tests/bundles/jammy-yoga.yaml Normal file
View File

@ -0,0 +1,89 @@
variables:
openstack-origin: &openstack-origin distro
series: jammy
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'
nrpe:
charm: cs:nrpe
series: focal
ovn-central:
charm: cs:~openstack-charmers-next/ovn-central
num_units: 3
options:
source: *openstack-origin
to:
- '4'
- '5'
- '6'
magpie:
charm: cs:~openstack-charmers-next/magpie
num_units: 2
to:
- '7'
- '8'
ovn-chassis:
charm: cs:~openstack-charmers-next/ovn-chassis
relations:
- - 'vault:shared-db'
- 'vault-mysql-router:shared-db'
- - 'vault-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'ovn-central:certificates'
- 'vault:certificates'
- - 'magpie:juju-info'
- 'ovn-chassis:juju-info'
- - 'ovn-chassis:ovsdb'
- 'ovn-central:ovsdb'
- - 'ovn-chassis:certificates'
- 'vault:certificates'
- - 'ovn-chassis:nrpe-external-master'
- 'nrpe:nrpe-external-master'
- - 'magpie:juju-info'
- 'nrpe:general-info'

8
src/tests/tests.yaml
View File

@ -1,16 +1,17 @@
charm_name: ovn-chassis
gate_bundles:
- bionic-train
- bionic-ussuri
- focal
- hirsute
- impish
smoke_bundles:
- focal
dev_bundles:
- hirsute
- impish
- bionic-train
- jammy
target_deploy_status:
magpie:
@ -41,3 +42,4 @@ tests_options:
force_deploy:
- hirsute # as nrpe is deployed, and nrpe only supports LTS releases
- impish # as nrpe is deployed, and nrpe only supports LTS releases
- jammy

1
test-requirements.txt
View File

@ -3,6 +3,7 @@
# 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

5
tox.ini
View File

@ -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