openstack
/
charm-mysql-innodb-cluster
Code Issues Proposed changes

Add yoga bundles and release-tool syncs 

* charm-helpers sync for classic charms
* pin pyparsing for aodhclient
* pin cffi for py35
* add non-voting focal-yoga bundle
* add non-voting jammy-yoga bundle
* add series metadata for jammy
* switch xena bundles to voting
* run focal-ussuri as smoke tests
* remove trusty, xenial, and groovy metadata and tests

Change-Id: Ibb22cd736e8b500de9cab0905e389c1d9669cc62
This commit is contained in:
Corey Bryant 2021-10-29 17:00:41 -04:00
parent 57b02930bd
commit c960f2d024
9 changed files with 189 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
osci.yaml
View File

@ -8,6 +8,8 @@
- full_model-hirsute-full-ha
- full_model-impish-full-ha:
voting: false
- full_model-jammy-full-ha:
voting: false
vars:
needs_charm_build: true
charm_build_name: mysql-innodb-cluster
@ -19,12 +21,6 @@
- focal
vars:
tox_extra_args: full_model:focal-full-ha
- job:
name: full_model-groovy-full-ha
parent: func-target
dependencies: *smoke-jobs
vars:
tox_extra_args: full_model:groovy-full-ha
- job:
name: full_model-hirsute-full-ha
parent: func-target
@ -37,3 +33,9 @@
dependencies: *smoke-jobs
vars:
tox_extra_args: full_model:impish-full-ha
- job:
name: full_model-jammy-full-ha
parent: func-target
dependencies: *smoke-jobs
vars:
tox_extra_args: full_model:jammy-full-ha

1
requirements.txt
View File

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

1
src/tests/bundles/groovy-full-ha.yaml
View File

@ -1 +0,0 @@
groovy-full.yaml

6
src/tests/bundles/groovy-full.yaml → src/tests/bundles/jammy-full-ha.yaml
View File

@ -1,7 +1,7 @@
variables:
openstack-origin: &openstack-origin distro-proposed
openstack-origin: &openstack-origin distro
series: &series groovy
series: &series jammy
applications:
keystone-mysql-router:
@ -79,7 +79,7 @@ applications:
memcached:
charm: cs:memcached
num_units: 1
series: bionic
series: focal
relations:
- - neutron-api:amqp
- rabbitmq-server:amqp

161
src/tests/bundles/jammy-full.yaml Normal file
View File

@ -0,0 +1,161 @@
variables:
openstack-origin: &openstack-origin distro
series: &series jammy
applications:
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
nova-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
glance-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
neutron-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
placement-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
vault-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
mysql-innodb-cluster:
charm: ../../../mysql-innodb-cluster
num_units: 3
options:
source: *openstack-origin
keystone:
charm: cs:~openstack-charmers-next/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
num_units: 1
options:
source: *openstack-origin
vault:
charm: cs:~openstack-charmers-next/vault
num_units: 1
ovn-central:
charm: cs:~openstack-charmers-next/ovn-central
num_units: 3
options:
source: *openstack-origin
neutron-api-plugin-ovn:
charm: cs:~openstack-charmers-next/neutron-api-plugin-ovn
neutron-api:
charm: cs:~openstack-charmers-next/neutron-api
series: *series
num_units: 1
options:
flat-network-providers: physnet1
neutron-security-groups: true
openstack-origin: *openstack-origin
glance:
charm: cs:~openstack-charmers-next/glance
num_units: 1
options:
openstack-origin: *openstack-origin
nova-cloud-controller:
charm: cs:~openstack-charmers-next/nova-cloud-controller
num_units: 1
options:
network-manager: Neutron
openstack-origin: *openstack-origin
ovn-chassis:
charm: cs:~openstack-charmers-next/ovn-chassis
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
num_units: 1
options:
config-flags: default_ephemeral_format=ext4
enable-live-migration: true
enable-resize: true
migration-auth-type: ssh
openstack-origin: *openstack-origin
placement:
charm: cs:~openstack-charmers-next/placement
num_units: 1
options:
openstack-origin: *openstack-origin
memcached:
charm: cs:memcached
num_units: 1
series: focal
relations:
- - neutron-api:amqp
- rabbitmq-server:amqp
- - neutron-api:neutron-api
- nova-cloud-controller:neutron-api
- - neutron-api:identity-service
- keystone:identity-service
- - nova-cloud-controller:amqp
- rabbitmq-server:amqp
- - nova-compute:amqp
- rabbitmq-server:amqp
- - nova-cloud-controller:identity-service
- keystone:identity-service
- - nova-cloud-controller:cloud-compute
- nova-compute:cloud-compute
- - glance:identity-service
- keystone:identity-service
- - glance:amqp
- rabbitmq-server:amqp
- - nova-compute:image-service
- glance:image-service
- - nova-cloud-controller:image-service
- glance:image-service
- - placement:identity-service
- keystone:identity-service
- - placement:placement
- nova-cloud-controller:placement
- - neutron-api-plugin-ovn:neutron-plugin
- neutron-api:neutron-plugin-api-subordinate
- - ovn-central:certificates
- vault:certificates
- - ovn-central:ovsdb-cms
- neutron-api-plugin-ovn:ovsdb-cms
- - neutron-api:certificates
- vault:certificates
- - ovn-chassis:nova-compute
- nova-compute:neutron-plugin
- - ovn-chassis:certificates
- vault:certificates
- - ovn-chassis:ovsdb
- ovn-central:ovsdb
- - vault:certificates
- neutron-api-plugin-ovn:certificates
- - vault:certificates
- glance:certificates
- - vault:certificates
- keystone:certificates
- - vault:certificates
- nova-cloud-controller:certificates
- - vault:certificates
- placement:certificates
- - vault:certificates
- mysql-innodb-cluster:certificates
- - memcached:cache
- nova-cloud-controller:memcache
- - keystone:shared-db
- keystone-mysql-router:shared-db
- - glance:shared-db
- glance-mysql-router:shared-db
- - nova-cloud-controller:shared-db
- nova-mysql-router:shared-db
- - neutron-api:shared-db
- neutron-mysql-router:shared-db
- - placement:shared-db
- placement-mysql-router:shared-db
- - vault:shared-db
- vault-mysql-router:shared-db
- - keystone-mysql-router:db-router
- mysql-innodb-cluster:db-router
- - nova-mysql-router:db-router
- mysql-innodb-cluster:db-router
- - glance-mysql-router:db-router
- mysql-innodb-cluster:db-router
- - neutron-mysql-router:db-router
- mysql-innodb-cluster:db-router
- - placement-mysql-router:db-router
- mysql-innodb-cluster:db-router
- - vault-mysql-router:db-router
- mysql-innodb-cluster:db-router

3
src/tests/bundles/groovy.yaml → src/tests/bundles/jammy.yaml
View File

@ -1,11 +1,10 @@
series: groovy
series: jammy
applications:
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
vault-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
mysql-innodb-cluster:
series: groovy
charm: ../../../mysql-innodb-cluster
num_units: 3
keystone:

0
src/tests/bundles/overlays/groovy-full-ha.yaml.j2 → src/tests/bundles/overlays/jammy-full-ha.yaml.j2
View File

24
src/tests/tests.yaml
View File

@ -27,25 +27,27 @@ tests:
gate_bundles:
- scale_in_out: focal
- scale_in_out: hirsute
- scale_in_out: impish
- full_model: focal-full-ha
- full_model: hirsute-full-ha
- full_model: impish-full-ha
smoke_bundles:
- focal
- full_model: focal
dev_bundles:
- scale_in_out: groovy
- full_model: groovy-full-ha
- scale_in_out: hirsute
- full_model: hirsute-full-ha
- scale_in_out: impish
- full_model: impish-full-ha
- scale_in_out: jammy
- full_model: jammy-full-ha
tests_options:
force_deploy:
- groovy
- groovy-full-ha
- impish
- impish-full-ha
- hirsute
- hirsute-full-ha
- impish
- impish-full-ha
- jammy
- jammy-full-ha
target_deploy_status:
neutron-api-plugin-ovn:

2
test-requirements.txt
View File

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