Test bundles for focal-wallaby and hirsute-wallaby

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

hisute-wallaby test is disabled (moved to dev) due to [1].

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

Change-Id: I70c579bc425746b30be12cb30e660542da842c48
This commit is contained in:
Alex Kavanagh 2021-03-05 12:16:19 +00:00 committed by Aurelien Lourot
parent a8c7b46928
commit 129e0ca9bf
4 changed files with 183 additions and 2 deletions

View File

@ -9,7 +9,9 @@
- bionic-ussuri
- focal-ussuri
- focal-victoria
- focal-wallaby
- groovy-victoria
- hirsute-wallaby
vars:
needs_charm_build: true
charm_build_name: manila-generic
charm_build_name: manila-generic

View File

@ -0,0 +1,85 @@
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':
services:
manila-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
keystone-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'
manila:
charm: cs:~openstack-charmers-next/manila
num_units: 1
options:
default-share-backend: generic
openstack-origin: *openstack-origin
to:
- '3'
manila-generic:
charm: ../../../manila-generic
options:
driver-handles-share-servers: False
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
num_units: 1
options:
source: *openstack-origin
to:
- '4'
keystone:
charm: cs:~openstack-charmers-next/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '5'
relations:
- - 'manila:shared-db'
- 'manila-mysql-router:shared-db'
- - 'manila-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'manila:manila-plugin'
- 'manila-generic'
- - 'manila'
- 'rabbitmq-server'
- - 'manila'
- 'keystone'
- - 'keystone:shared-db'
- 'keystone-mysql-router:shared-db'
- - 'keystone-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'

View File

@ -0,0 +1,85 @@
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':
services:
manila-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
keystone-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'
manila:
charm: cs:~openstack-charmers-next/manila
num_units: 1
options:
default-share-backend: generic
openstack-origin: *openstack-origin
to:
- '3'
manila-generic:
charm: ../../../manila-generic
options:
driver-handles-share-servers: False
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
num_units: 1
options:
source: *openstack-origin
to:
- '4'
keystone:
charm: cs:~openstack-charmers-next/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '5'
relations:
- - 'manila:shared-db'
- 'manila-mysql-router:shared-db'
- - 'manila-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'manila:manila-plugin'
- 'manila-generic'
- - 'manila'
- 'rabbitmq-server'
- - 'manila'
- 'keystone'
- - 'keystone:shared-db'
- 'keystone-mysql-router:shared-db'
- - 'keystone-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'

View File

@ -1,4 +1,5 @@
charm_name: manila-generic
gate_bundles:
- bionic-queens
- bionic-stein
@ -6,18 +7,26 @@ gate_bundles:
- bionic-ussuri
- focal-ussuri
- focal-victoria
- focal-wallaby
- groovy-victoria
smoke_bundles:
- focal-ussuri
dev_bundles:
- xenial-pike
- xenial-queens
- bionic-rocky
- hirsute-wallaby
target_deploy_status: {}
tests:
- zaza.openstack.charm_tests.manila.tests.ManilaTests
configure:
- zaza.openstack.charm_tests.keystone.setup.add_demo_user
tests_options:
force_deploy:
- groovy-victoria
- hirsute-wallaby