openstack
/
charm-neutron-dynamic-routing
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: I11f3688718d11db7043a47d661b75e8ee629f180
This commit is contained in:
Corey Bryant 2021-10-29 17:00:41 -04:00
parent 7f8c159249
commit 594689b699
12 changed files with 157 additions and 198 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
osci.yaml
View File

@ -3,29 +3,37 @@
- charm-unit-jobs
check:
jobs:
- impish-xena-functional:
- bionic-queens-functional
- bionic-stein-functional
- bionic-train-functional
- bionic-ussuri-functional
- focal-ussuri-functional
- focal-victoria-functional
- focal-wallaby-functional
- focal-xena-functional
- focal-yoga-functional:
voting: false
- hirsute-wallaby-functional
- groovy-victoria-functional
- focal-xena-functional:
- impish-xena-functional:
voting: false
- jammy-yoga-functional:
voting: false
- focal-wallaby-functional
- focal-victoria-functional
- focal-ussuri-functional
- bionic-ussuri-functional
- bionic-train-functional
- bionic-stein-functional
- bionic-queens-functional
vars:
needs_charm_build: true
charm_build_name: neutron-dynamic-routing
- job:
name: impish-xena-functional
name: jammy-yoga-functional
parent: func-target
dependencies: &smoke-jobs
- bionic-ussuri-functional
vars:
tox_extra_args: jammy-yoga-functional
- job:
name: impish-xena-functional
parent: func-target
dependencies: *smoke-jobs
vars:
tox_extra_args: impish-xena-functional
- job:
@ -35,11 +43,11 @@
vars:
tox_extra_args: hirsute-wallaby-functional
- job:
name: groovy-victoria-functional
name: focal-yoga-functional
parent: func-target
dependencies: *smoke-jobs
vars:
tox_extra_args: groovy-victoria-functional
tox_extra_args: focal-yoga-functional
- job:
name: focal-xena-functional
parent: func-target

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/metadata.yaml
View File

@ -7,7 +7,6 @@ description: |
tags:
- openstack
series:
- xenial
- bionic
- focal
- groovy

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

@ -0,0 +1,113 @@
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':
# for quagga which has no focal support yet
series: bionic
applications:
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
neutron-api-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'
keystone:
charm: cs:~openstack-charmers-next/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
haproxy-server-timeout: 90000
haproxy-client-timeout: 90000
haproxy-queue-timeout: 9000
haproxy-connect-timeout: 9000
to:
- '3'
neutron-api:
charm: cs:~openstack-charmers-next/neutron-api
num_units: 1
options:
manage-neutron-plugin-legacy-mode: true
neutron-plugin: ovs
flat-network-providers: physnet1,
neutron-security-groups: true
openstack-origin: *openstack-origin
haproxy-server-timeout: 90000
haproxy-client-timeout: 90000
haproxy-queue-timeout: 9000
haproxy-connect-timeout: 9000
to:
- '4'
neutron-dynamic-routing:
charm: ../../../neutron-dynamic-routing
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '5'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
num_units: 1
options:
source: *openstack-origin
to:
- '6'
quagga:
charm: cs:~openstack-charmers-next/bionic/quagga
series: bionic
num_units: 1
to:
- '7'
relations:
- - 'neutron-dynamic-routing:amqp'
- 'rabbitmq-server:amqp'
- - 'neutron-dynamic-routing:bgp-speaker'
- 'quagga:bgpclient'
- - 'keystone:shared-db'
- 'keystone-mysql-router:shared-db'
- - 'keystone-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'neutron-api:shared-db'
- 'neutron-api-mysql-router:shared-db'
- - 'neutron-api-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'neutron-api:amqp'
- 'rabbitmq-server:amqp'
- - 'neutron-api:identity-service'
- 'keystone:identity-service'

2
src/tests/bundles/hirsute-wallaby-functional.yaml
View File

@ -17,7 +17,7 @@ machines:
'5':
'6':
'7':
# for quagga which has no focal/groovy/hirsute support yet
# for quagga which has no hirsute support yet
series: bionic
applications:

2
src/tests/bundles/impish-xena-functional.yaml
View File

@ -17,7 +17,7 @@ machines:
'5':
'6':
'7':
# for quagga which has no focal/groovy/hirsute support yet
# for quagga which has no impish support yet
series: bionic
applications:

4
src/tests/bundles/groovy-victoria-functional.yaml → src/tests/bundles/jammy-yoga-functional.yaml
View File

@ -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'
@ -17,7 +17,7 @@ machines:
'5':
'6':
'7':
# for quagga which has no focal/groovy support yet
# for quagga which has no jammy support yet
series: bionic
applications:

56
src/tests/bundles/xenial-ocata-functional.yaml
View File

@ -1,56 +0,0 @@
series: xenial
relations:
- [neutron-dynamic-routing, rabbitmq-server]
- [neutron-dynamic-routing, quagga]
- [keystone, mysql]
- [neutron-api, mysql]
- [neutron-api, rabbitmq-server]
- [neutron-api, keystone]
applications:
keystone:
charm: cs:~openstack-charmers-next/xenial/keystone
constraints: mem=1G
num_units: 1
options:
openstack-origin: 'cloud:xenial-ocata'
haproxy-server-timeout: 90000
haproxy-client-timeout: 90000
haproxy-queue-timeout: 9000
haproxy-connect-timeout: 9000
series: xenial
mysql:
charm: cs:~openstack-charmers-next/xenial/percona-cluster
constraints: mem=4G
num_units: 1
options: {source: 'cloud:xenial-ocata'}
series: xenial
neutron-api:
charm: cs:~openstack-charmers-next/xenial/neutron-api
constraints: mem=1G
num_units: 1
options:
flat-network-providers: physnet1
neutron-security-groups: true
openstack-origin: 'cloud:xenial-ocata'
haproxy-server-timeout: 90000
haproxy-client-timeout: 90000
haproxy-queue-timeout: 9000
haproxy-connect-timeout: 9000
series: xenial
neutron-dynamic-routing:
charm: ../../../neutron-dynamic-routing
num_units: 1
options: {openstack-origin: 'cloud:xenial-ocata'}
series: xenial
rabbitmq-server:
charm: cs:~openstack-charmers-next/xenial/rabbitmq-server
constraints: mem=1G
num_units: 1
options: {source: 'cloud:xenial-ocata'}
series: xenial
quagga:
charm: cs:~openstack-charmers-next/xenial/quagga
num_units: 1
options: {use-16bit-asn: True}
series: xenial

55
src/tests/bundles/xenial-pike-functional.yaml
View File

@ -1,55 +0,0 @@
series: xenial
relations:
- [neutron-dynamic-routing, rabbitmq-server]
- [neutron-dynamic-routing, quagga]
- [keystone, mysql]
- [neutron-api, mysql]
- [neutron-api, rabbitmq-server]
- [neutron-api, keystone]
applications:
keystone:
charm: cs:~openstack-charmers-next/xenial/keystone
constraints: mem=1G
num_units: 1
options:
openstack-origin: 'cloud:xenial-pike'
haproxy-server-timeout: 90000
haproxy-client-timeout: 90000
haproxy-queue-timeout: 9000
haproxy-connect-timeout: 9000
series: xenial
mysql:
charm: cs:~openstack-charmers-next/xenial/percona-cluster
constraints: mem=4G
num_units: 1
options: {source: 'cloud:xenial-pike'}
series: xenial
neutron-api:
charm: cs:~openstack-charmers-next/xenial/neutron-api
constraints: mem=1G
num_units: 1
options:
flat-network-providers: physnet1
neutron-security-groups: true
openstack-origin: 'cloud:xenial-pike'
haproxy-server-timeout: 90000
haproxy-client-timeout: 90000
haproxy-queue-timeout: 9000
haproxy-connect-timeout: 9000
series: xenial
neutron-dynamic-routing:
charm: ../../../neutron-dynamic-routing
num_units: 1
options: {openstack-origin: 'cloud:xenial-pike'}
series: xenial
rabbitmq-server:
charm: cs:~openstack-charmers-next/xenial/rabbitmq-server
constraints: mem=1G
num_units: 1
options: {source: 'cloud:xenial-pike'}
series: xenial
quagga:
charm: cs:~openstack-charmers-next/xenial/quagga
num_units: 1
options: {use-16bit-asn: True}
series: xenial

53
src/tests/bundles/xenial-queens-functional.yaml
View File

@ -1,53 +0,0 @@
relations:
- [neutron-dynamic-routing, rabbitmq-server]
- [neutron-dynamic-routing, quagga]
- [keystone, mysql]
- [neutron-api, mysql]
- [neutron-api, rabbitmq-server]
- [neutron-api, keystone]
applications:
keystone:
charm: cs:~openstack-charmers-next/xenial/keystone
constraints: mem=1G
num_units: 1
options:
openstack-origin: 'cloud:xenial-queens'
haproxy-server-timeout: 90000
haproxy-client-timeout: 90000
haproxy-queue-timeout: 9000
haproxy-connect-timeout: 9000
series: xenial
mysql:
charm: cs:~openstack-charmers-next/xenial/percona-cluster
constraints: mem=4G
num_units: 1
options: {source: 'cloud:xenial-queens'}
series: xenial
neutron-api:
charm: cs:~openstack-charmers-next/xenial/neutron-api
constraints: mem=1G
num_units: 1
options:
flat-network-providers: physnet1,
neutron-security-groups: true
openstack-origin: 'cloud:xenial-queens'
haproxy-server-timeout: 90000
haproxy-client-timeout: 90000
haproxy-queue-timeout: 9000
haproxy-connect-timeout: 9000
series: xenial
neutron-dynamic-routing:
charm: ../../../neutron-dynamic-routing
num_units: 1
options: {openstack-origin: 'cloud:xenial-queens'}
series: xenial
rabbitmq-server:
charm: cs:~openstack-charmers-next/xenial/rabbitmq-server
constraints: mem=1G
num_units: 1
options: {source: 'cloud:xenial-queens'}
series: xenial
quagga:
charm: cs:~openstack-charmers-next/xenial/quagga
num_units: 1
series: xenial

32
src/tests/tests.yaml
View File

@ -4,30 +4,30 @@ configure:
- zaza.openstack.charm_tests.dragent.configure.setup
gate_bundles:
- groovy-victoria-functional
- focal-wallaby-functional
- focal-victoria-functional
- focal-ussuri-functional
- bionic-ussuri-functional
- bionic-train-functional
- bionic-stein-functional
- bionic-queens-functional
smoke_bundles:
- bionic-train-functional
dev_bundles:
- xenial-pike-functional
- xenial-queens-functional
- bionic-rocky-functional
- bionic-stein-functional
- bionic-ussuri-functional
- focal-ussuri-functional
- focal-victoria-functional
- focal-wallaby-functional
- focal-xena-functional
- hirsute-wallaby-functional
- impish-xena-functional
smoke_bundles:
- focal-ussuri-functional
dev_bundles:
- bionic-rocky-functional
- bionic-train-functional
- focal-yoga-functional
- jammy-yoga-functional
tests:
- zaza.openstack.charm_tests.dragent.tests.DRAgentTest
tests_options:
force_deploy:
- groovy-victoria-functional
- hirsute-wallaby-functional
- impish-xena-functional
- jammy-yoga-functional

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