Test bundles for focal-wallaby and hirsute-wallaby
These are the test bundles (and any associated changes) for focal-wallaby and hirsute-wallaby support. Sync libraries. 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: I9534bd7092d2c2abe9e2a85703d4cf9b8f763d82
This commit is contained in:
parent
7be35ccee0
commit
59674b090d
|
@ -12,4 +12,6 @@
|
||||||
- bionic-train
|
- bionic-train
|
||||||
- bionic-ussuri
|
- bionic-ussuri
|
||||||
- focal-victoria
|
- focal-victoria
|
||||||
- groovy-victoria
|
- focal-wallaby
|
||||||
|
- groovy-victoria
|
||||||
|
#- hirsute-wallaby
|
||||||
|
|
|
@ -0,0 +1,164 @@
|
||||||
|
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':
|
||||||
|
'9':
|
||||||
|
'10':
|
||||||
|
'11':
|
||||||
|
'12':
|
||||||
|
'13':
|
||||||
|
|
||||||
|
applications:
|
||||||
|
|
||||||
|
keystone-mysql-router:
|
||||||
|
charm: cs:~openstack-charmers-next/mysql-router
|
||||||
|
cinder-mysql-router:
|
||||||
|
charm: cs:~openstack-charmers-next/mysql-router
|
||||||
|
glance-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
|
||||||
|
to:
|
||||||
|
- '3'
|
||||||
|
|
||||||
|
rabbitmq-server:
|
||||||
|
charm: cs:~openstack-charmers-next/rabbitmq-server
|
||||||
|
num_units: 1
|
||||||
|
to:
|
||||||
|
- '4'
|
||||||
|
|
||||||
|
ceph-mon:
|
||||||
|
charm: cs:~openstack-charmers-next/ceph-mon
|
||||||
|
num_units: 3
|
||||||
|
options:
|
||||||
|
monitor-count: '3'
|
||||||
|
source: *openstack-origin
|
||||||
|
to:
|
||||||
|
- '5'
|
||||||
|
- '6'
|
||||||
|
- '7'
|
||||||
|
|
||||||
|
ceph-osd:
|
||||||
|
charm: cs:~openstack-charmers-next/ceph-osd
|
||||||
|
num_units: 3
|
||||||
|
storage:
|
||||||
|
osd-devices: 'cinder,10G'
|
||||||
|
options:
|
||||||
|
osd-devices: '/dev/test-non-existent'
|
||||||
|
source: *openstack-origin
|
||||||
|
to:
|
||||||
|
- '8'
|
||||||
|
- '9'
|
||||||
|
- '10'
|
||||||
|
|
||||||
|
cinder:
|
||||||
|
charm: cs:~openstack-charmers-next/cinder
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
block-device: 'None'
|
||||||
|
glance-api-version: '2'
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
to:
|
||||||
|
- '11'
|
||||||
|
|
||||||
|
cinder-backup:
|
||||||
|
charm: ../../../cinder-backup
|
||||||
|
options:
|
||||||
|
ceph-osd-replication-count: 3
|
||||||
|
|
||||||
|
cinder-ceph:
|
||||||
|
charm: cs:~openstack-charmers-next/cinder-ceph
|
||||||
|
options:
|
||||||
|
ceph-osd-replication-count: 3
|
||||||
|
|
||||||
|
glance:
|
||||||
|
charm: cs:~openstack-charmers-next/glance
|
||||||
|
num_units: 1
|
||||||
|
to:
|
||||||
|
- '12'
|
||||||
|
|
||||||
|
nova-compute:
|
||||||
|
charm: cs:~openstack-charmers-next/nova-compute
|
||||||
|
num_units: 1
|
||||||
|
to:
|
||||||
|
- '13'
|
||||||
|
|
||||||
|
relations:
|
||||||
|
|
||||||
|
- - 'cinder-backup:ceph'
|
||||||
|
- 'ceph-mon:client'
|
||||||
|
|
||||||
|
- - 'cinder-ceph:ceph'
|
||||||
|
- 'ceph-mon:client'
|
||||||
|
|
||||||
|
- - 'ceph-osd:mon'
|
||||||
|
- 'ceph-mon:osd'
|
||||||
|
|
||||||
|
- - 'cinder:storage-backend'
|
||||||
|
- 'cinder-ceph:storage-backend'
|
||||||
|
|
||||||
|
- - 'cinder:backup-backend'
|
||||||
|
- 'cinder-backup:backup-backend'
|
||||||
|
|
||||||
|
- - 'keystone:shared-db'
|
||||||
|
- 'keystone-mysql-router:shared-db'
|
||||||
|
- - 'keystone-mysql-router:db-router'
|
||||||
|
- 'mysql-innodb-cluster:db-router'
|
||||||
|
|
||||||
|
- - 'cinder:shared-db'
|
||||||
|
- 'cinder-mysql-router:shared-db'
|
||||||
|
- - 'cinder-mysql-router:db-router'
|
||||||
|
- 'mysql-innodb-cluster:db-router'
|
||||||
|
|
||||||
|
- - 'cinder:identity-service'
|
||||||
|
- 'keystone:identity-service'
|
||||||
|
|
||||||
|
- - 'cinder:amqp'
|
||||||
|
- 'rabbitmq-server:amqp'
|
||||||
|
|
||||||
|
- - 'glance:image-service'
|
||||||
|
- 'nova-compute:image-service'
|
||||||
|
|
||||||
|
- - 'glance:identity-service'
|
||||||
|
- 'keystone:identity-service'
|
||||||
|
|
||||||
|
- - 'glance:shared-db'
|
||||||
|
- 'glance-mysql-router:shared-db'
|
||||||
|
- - 'glance-mysql-router:db-router'
|
||||||
|
- 'mysql-innodb-cluster:db-router'
|
||||||
|
|
||||||
|
- - 'nova-compute:ceph-access'
|
||||||
|
- 'cinder-ceph:ceph-access'
|
||||||
|
|
||||||
|
- - 'nova-compute:amqp'
|
||||||
|
- 'rabbitmq-server:amqp'
|
|
@ -0,0 +1,164 @@
|
||||||
|
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':
|
||||||
|
'9':
|
||||||
|
'10':
|
||||||
|
'11':
|
||||||
|
'12':
|
||||||
|
'13':
|
||||||
|
|
||||||
|
applications:
|
||||||
|
|
||||||
|
keystone-mysql-router:
|
||||||
|
charm: cs:~openstack-charmers-next/mysql-router
|
||||||
|
cinder-mysql-router:
|
||||||
|
charm: cs:~openstack-charmers-next/mysql-router
|
||||||
|
glance-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
|
||||||
|
to:
|
||||||
|
- '3'
|
||||||
|
|
||||||
|
rabbitmq-server:
|
||||||
|
charm: cs:~openstack-charmers-next/rabbitmq-server
|
||||||
|
num_units: 1
|
||||||
|
to:
|
||||||
|
- '4'
|
||||||
|
|
||||||
|
ceph-mon:
|
||||||
|
charm: cs:~openstack-charmers-next/ceph-mon
|
||||||
|
num_units: 3
|
||||||
|
options:
|
||||||
|
monitor-count: '3'
|
||||||
|
source: *openstack-origin
|
||||||
|
to:
|
||||||
|
- '5'
|
||||||
|
- '6'
|
||||||
|
- '7'
|
||||||
|
|
||||||
|
ceph-osd:
|
||||||
|
charm: cs:~openstack-charmers-next/ceph-osd
|
||||||
|
num_units: 3
|
||||||
|
storage:
|
||||||
|
osd-devices: 'cinder,10G'
|
||||||
|
options:
|
||||||
|
osd-devices: '/dev/test-non-existent'
|
||||||
|
source: *openstack-origin
|
||||||
|
to:
|
||||||
|
- '8'
|
||||||
|
- '9'
|
||||||
|
- '10'
|
||||||
|
|
||||||
|
cinder:
|
||||||
|
charm: cs:~openstack-charmers-next/cinder
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
block-device: 'None'
|
||||||
|
glance-api-version: '2'
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
to:
|
||||||
|
- '11'
|
||||||
|
|
||||||
|
cinder-backup:
|
||||||
|
charm: ../../../cinder-backup
|
||||||
|
options:
|
||||||
|
ceph-osd-replication-count: 3
|
||||||
|
|
||||||
|
cinder-ceph:
|
||||||
|
charm: cs:~openstack-charmers-next/cinder-ceph
|
||||||
|
options:
|
||||||
|
ceph-osd-replication-count: 3
|
||||||
|
|
||||||
|
glance:
|
||||||
|
charm: cs:~openstack-charmers-next/glance
|
||||||
|
num_units: 1
|
||||||
|
to:
|
||||||
|
- '12'
|
||||||
|
|
||||||
|
nova-compute:
|
||||||
|
charm: cs:~openstack-charmers-next/nova-compute
|
||||||
|
num_units: 1
|
||||||
|
to:
|
||||||
|
- '13'
|
||||||
|
|
||||||
|
relations:
|
||||||
|
|
||||||
|
- - 'cinder-backup:ceph'
|
||||||
|
- 'ceph-mon:client'
|
||||||
|
|
||||||
|
- - 'cinder-ceph:ceph'
|
||||||
|
- 'ceph-mon:client'
|
||||||
|
|
||||||
|
- - 'ceph-osd:mon'
|
||||||
|
- 'ceph-mon:osd'
|
||||||
|
|
||||||
|
- - 'cinder:storage-backend'
|
||||||
|
- 'cinder-ceph:storage-backend'
|
||||||
|
|
||||||
|
- - 'cinder:backup-backend'
|
||||||
|
- 'cinder-backup:backup-backend'
|
||||||
|
|
||||||
|
- - 'keystone:shared-db'
|
||||||
|
- 'keystone-mysql-router:shared-db'
|
||||||
|
- - 'keystone-mysql-router:db-router'
|
||||||
|
- 'mysql-innodb-cluster:db-router'
|
||||||
|
|
||||||
|
- - 'cinder:shared-db'
|
||||||
|
- 'cinder-mysql-router:shared-db'
|
||||||
|
- - 'cinder-mysql-router:db-router'
|
||||||
|
- 'mysql-innodb-cluster:db-router'
|
||||||
|
|
||||||
|
- - 'cinder:identity-service'
|
||||||
|
- 'keystone:identity-service'
|
||||||
|
|
||||||
|
- - 'cinder:amqp'
|
||||||
|
- 'rabbitmq-server:amqp'
|
||||||
|
|
||||||
|
- - 'glance:image-service'
|
||||||
|
- 'nova-compute:image-service'
|
||||||
|
|
||||||
|
- - 'glance:identity-service'
|
||||||
|
- 'keystone:identity-service'
|
||||||
|
|
||||||
|
- - 'glance:shared-db'
|
||||||
|
- 'glance-mysql-router:shared-db'
|
||||||
|
- - 'glance-mysql-router:db-router'
|
||||||
|
- 'mysql-innodb-cluster:db-router'
|
||||||
|
|
||||||
|
- - 'nova-compute:ceph-access'
|
||||||
|
- 'cinder-ceph:ceph-access'
|
||||||
|
|
||||||
|
- - 'nova-compute:amqp'
|
||||||
|
- 'rabbitmq-server:amqp'
|
|
@ -1,6 +1,8 @@
|
||||||
charm_name: cinder-backup
|
charm_name: cinder-backup
|
||||||
|
|
||||||
smoke_bundles:
|
smoke_bundles:
|
||||||
- bionic-train
|
- bionic-train
|
||||||
|
|
||||||
gate_bundles:
|
gate_bundles:
|
||||||
- xenial-mitaka
|
- xenial-mitaka
|
||||||
- bionic-queens
|
- bionic-queens
|
||||||
|
@ -8,7 +10,9 @@ gate_bundles:
|
||||||
- bionic-train
|
- bionic-train
|
||||||
- bionic-ussuri
|
- bionic-ussuri
|
||||||
- focal-victoria
|
- focal-victoria
|
||||||
|
- focal-wallaby
|
||||||
- groovy-victoria
|
- groovy-victoria
|
||||||
|
|
||||||
dev_bundles:
|
dev_bundles:
|
||||||
- trusty-mitaka # fails often because of lp:1877076
|
- trusty-mitaka # fails often because of lp:1877076
|
||||||
- xenial-ocata
|
- xenial-ocata
|
||||||
|
@ -16,8 +20,11 @@ dev_bundles:
|
||||||
- xenial-queens
|
- xenial-queens
|
||||||
- bionic-rocky
|
- bionic-rocky
|
||||||
- focal-ussuri # disabled because of lp:1891626
|
- focal-ussuri # disabled because of lp:1891626
|
||||||
|
- hirsute-wallaby
|
||||||
|
|
||||||
tests:
|
tests:
|
||||||
- zaza.openstack.charm_tests.cinder_backup.tests.CinderBackupTest
|
- zaza.openstack.charm_tests.cinder_backup.tests.CinderBackupTest
|
||||||
|
|
||||||
tests_options:
|
tests_options:
|
||||||
force_deploy:
|
force_deploy:
|
||||||
- groovy-victoria
|
- hirsute-wallaby
|
||||||
|
|
Loading…
Reference in New Issue