Test bundles for focal-wallaby and hirsute-wallaby
These are the test bundles (and any associated changes) for
focal-wallaby and hirsute-wallaby support.
Change-Id: I6d21ce67b7d85811dc6b7f800ee5367a71fc3b98
Co-authored-by: Aurelien Lourot <aurelien.lourot@canonical.com>
(cherry picked from commit c134578bbc
)
This commit is contained in:
parent
d1b4040d9b
commit
7e661b5308
16
osci.yaml
16
osci.yaml
|
@ -3,7 +3,9 @@
|
||||||
- charm-unit-jobs
|
- charm-unit-jobs
|
||||||
check:
|
check:
|
||||||
jobs:
|
jobs:
|
||||||
|
- hirsute-wallaby-functional
|
||||||
- groovy-victoria-functional
|
- groovy-victoria-functional
|
||||||
|
- focal-wallaby-functional
|
||||||
- focal-victoria-functional
|
- focal-victoria-functional
|
||||||
- focal-ussuri-functional
|
- focal-ussuri-functional
|
||||||
- bionic-ussuri-functional
|
- bionic-ussuri-functional
|
||||||
|
@ -16,12 +18,24 @@
|
||||||
|
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: groovy-victoria-functional
|
name: hirsute-wallaby-functional
|
||||||
parent: func-target
|
parent: func-target
|
||||||
dependencies: &smoke-jobs
|
dependencies: &smoke-jobs
|
||||||
- bionic-ussuri-functional
|
- bionic-ussuri-functional
|
||||||
|
vars:
|
||||||
|
tox_extra_args: hirsute-wallaby-functional
|
||||||
|
- job:
|
||||||
|
name: groovy-victoria-functional
|
||||||
|
parent: func-target
|
||||||
|
dependencies: *smoke-jobs
|
||||||
vars:
|
vars:
|
||||||
tox_extra_args: groovy-victoria-functional
|
tox_extra_args: groovy-victoria-functional
|
||||||
|
- job:
|
||||||
|
name: focal-wallaby-functional
|
||||||
|
parent: func-target
|
||||||
|
dependencies: *smoke-jobs
|
||||||
|
vars:
|
||||||
|
tox_extra_args: focal-wallaby-functional
|
||||||
- job:
|
- job:
|
||||||
name: focal-victoria-functional
|
name: focal-victoria-functional
|
||||||
parent: func-target
|
parent: func-target
|
||||||
|
|
|
@ -0,0 +1,113 @@
|
||||||
|
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':
|
||||||
|
# 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'
|
|
@ -0,0 +1,113 @@
|
||||||
|
variables:
|
||||||
|
openstack-origin: &openstack-origin distro
|
||||||
|
|
||||||
|
series: hirsute
|
||||||
|
|
||||||
|
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/groovy/hirsute 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'
|
|
@ -1,22 +1,30 @@
|
||||||
charm_name: neutron-dynamic-routing
|
charm_name: neutron-dynamic-routing
|
||||||
|
|
||||||
configure:
|
configure:
|
||||||
- zaza.openstack.charm_tests.dragent.configure.setup
|
- zaza.openstack.charm_tests.dragent.configure.setup
|
||||||
|
|
||||||
gate_bundles:
|
gate_bundles:
|
||||||
- groovy-victoria-functional
|
- groovy-victoria-functional
|
||||||
|
- focal-wallaby-functional
|
||||||
- focal-victoria-functional
|
- focal-victoria-functional
|
||||||
- focal-ussuri-functional
|
- focal-ussuri-functional
|
||||||
- bionic-ussuri-functional
|
- bionic-ussuri-functional
|
||||||
- bionic-train-functional
|
- bionic-train-functional
|
||||||
- bionic-stein-functional
|
- bionic-stein-functional
|
||||||
- bionic-queens-functional
|
- bionic-queens-functional
|
||||||
|
|
||||||
smoke_bundles:
|
smoke_bundles:
|
||||||
- bionic-train-functional
|
- bionic-train-functional
|
||||||
|
|
||||||
dev_bundles:
|
dev_bundles:
|
||||||
- xenial-pike-functional
|
- xenial-pike-functional
|
||||||
- xenial-queens-functional
|
- xenial-queens-functional
|
||||||
- bionic-rocky-functional
|
- bionic-rocky-functional
|
||||||
|
- hirsute-wallaby-functional
|
||||||
|
|
||||||
tests:
|
tests:
|
||||||
- zaza.openstack.charm_tests.dragent.tests.DRAgentTest
|
- zaza.openstack.charm_tests.dragent.tests.DRAgentTest
|
||||||
|
|
||||||
tests_options:
|
tests_options:
|
||||||
force_deploy:
|
force_deploy:
|
||||||
- groovy-victoria-functional
|
- hirsute-wallaby-functional
|
||||||
|
|
Loading…
Reference in New Issue