openstack
/
charm-rabbitmq-server
Code Issues Proposed changes

Test bundles for focal-wallaby and hirsute-wallaby 

These are the test bundles (and any associated changes) for
focal-wallaby and hirsute-wallaby support.

Libraries sync.

hisute-wallaby test is disabled (moved to dev) due to [1] as bundle may
reference a reactive charm.

[1] https://github.com/juju-solutions/layer-basic/issues/194

Change-Id: I7c4e4bfed4b61dd19bcab06f39a2d54a1d74f237
This commit is contained in:
Alex Kavanagh 2021-03-05 18:32:37 +00:00 committed by Aurelien Lourot
parent bb1146cba6
commit 453b8e979b
3 changed files with 214 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -0,0 +1,102 @@
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':
series: bionic # nagios not supported on focal yet
applications:
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
cinder-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'
rabbitmq-server:
charm: "../../../rabbitmq-server"
num_units: 3
constraints:
cpu-cores=2
options:
min-cluster-size: 3
max-cluster-tries: 6
ssl: "off"
management_plugin: "False"
stats_cron_schedule: "*/1 * * * *"
source: *openstack-origin
to:
- '3'
- '4'
- '5'
cinder:
charm: cs:~openstack-charmers-next/cinder
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '6'
keystone:
charm: cs:~openstack-charmers-next/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
admin-password: openstack
to:
- '7'
nagios:
charm: cs:nagios
series: bionic # not supported on focal yet
num_units: 1
to:
- '8'
nrpe:
charm: cs:nrpe
relations:
- - 'cinder:amqp'
- 'rabbitmq-server:amqp'
- - 'cinder:shared-db'
- 'cinder-mysql-router:shared-db'
- - 'cinder-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'cinder:identity-service'
- 'keystone:identity-service'
- - 'keystone:shared-db'
- 'keystone-mysql-router:shared-db'
- - 'keystone-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'nrpe:nrpe-external-master'
- 'rabbitmq-server:nrpe-external-master'
- - 'nrpe:monitors'
- 'nagios:monitors'

102
tests/bundles/hirsute-wallaby.yaml Normal file
View File

@ -0,0 +1,102 @@
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':
'8':
series: bionic # nagios not supported on focal+ yet
applications:
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
cinder-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'
rabbitmq-server:
charm: "../../../rabbitmq-server"
num_units: 3
constraints:
cpu-cores=2
options:
min-cluster-size: 3
max-cluster-tries: 6
ssl: "off"
management_plugin: "False"
stats_cron_schedule: "*/1 * * * *"
source: *openstack-origin
to:
- '3'
- '4'
- '5'
cinder:
charm: cs:~openstack-charmers-next/cinder
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '6'
keystone:
charm: cs:~openstack-charmers-next/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
admin-password: openstack
to:
- '7'
nagios:
charm: cs:nagios
series: bionic # not supported on focal+ yet
num_units: 1
to:
- '8'
nrpe:
charm: cs:nrpe
relations:
- - 'cinder:amqp'
- 'rabbitmq-server:amqp'
- - 'cinder:shared-db'
- 'cinder-mysql-router:shared-db'
- - 'cinder-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'cinder:identity-service'
- 'keystone:identity-service'
- - 'keystone:shared-db'
- 'keystone-mysql-router:shared-db'
- - 'keystone-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'nrpe:nrpe-external-master'
- 'rabbitmq-server:nrpe-external-master'
- - 'nrpe:monitors'
- 'nagios:monitors'

10
tests/tests.yaml
View File

@ -1,11 +1,15 @@
charm_name: rabbitmq-server
smoke_bundles:
- focal-ussuri
gate_bundles:
- xenial-mitaka
- bionic-queens
- focal-ussuri
- focal-wallaby
- groovy-victoria
dev_bundles:
- trusty-mitaka
- xenial-ocata
@ -16,9 +20,15 @@ dev_bundles:
- bionic-train
- bionic-ussuri
- focal-victoria
- hirsute-wallaby
tests:
- zaza.openstack.charm_tests.rabbitmq_server.tests.RabbitMQDeferredRestartTest
- zaza.openstack.charm_tests.rabbitmq_server.tests.RmqTests
tests_options:
force_deploy:
- hirsute-wallaby
# the nrpe charm doesn't support groovy and is in the bundle; it needs to
# be force installed.
- groovy-victoria