openstack
/
charm-ceph-radosgw
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.

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: I99ee073206c7fad4897bf7b7bb767cf143b40d70
This commit is contained in:
Alex Kavanagh 2021-03-03 20:33:52 +00:00 committed by Aurelien Lourot
parent aadc60233e
commit 096b665fec
6 changed files with 510 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
osci.yaml
View File

@ -3,8 +3,12 @@
- charm-unit-jobs
check:
jobs:
- vault-hirsute-wallaby_rgw
- vault-hirsute-wallaby-namespaced
- vault-groovy-victoria_rgw
- vault-groovy-victoria-namespaced
- vault-focal-wallaby_rgw
- vault-focal-wallaby-namespaced
- vault-focal-victoria_rgw
- vault-focal-victoria-namespaced
- vault-focal-ussuri-ec
@ -33,10 +37,22 @@
vars:
tox_extra_args: vault:bionic-ussuri
- job:
name: vault-groovy-victoria_rgw
name: vault-hirsute-wallaby_rgw
parent: func-target
dependencies: &smoke-jobs
- vault-bionic-ussuri
vars:
tox_extra_args: vault:hirsute-wallaby
- job:
name: vault-hirsute-wallaby-namespaced
parent: func-target
dependencies: *smoke-jobs
vars:
tox_extra_args: vault:hirsute-wallaby-namespaced
- job:
name: vault-groovy-victoria_rgw
parent: func-target
dependencies: *smoke-jobs
vars:
tox_extra_args: vault:groovy-victoria
- job:
@ -45,6 +61,18 @@
dependencies: *smoke-jobs
vars:
tox_extra_args: vault:groovy-victoria-namespaced
- job:
name: vault-focal-wallaby_rgw
parent: func-target
dependencies: *smoke-jobs
vars:
tox_extra_args: vault:focal-wallaby
- job:
name: vault-focal-wallaby-namespaced
parent: func-target
dependencies: *smoke-jobs
vars:
tox_extra_args: vault:focal-wallaby-namespaced
- job:
name: vault-focal-victoria_rgw
parent: func-target
@ -126,4 +154,4 @@
parent: func-target
dependencies: *smoke-jobs
vars:
tox_extra_args: xenial-mitaka-namespaced
tox_extra_args: xenial-mitaka-namespaced

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

@ -0,0 +1,117 @@
options:
source: &source 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':
applications:
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: *source
to:
- '0'
- '1'
- '2'
ceph-radosgw:
charm: ceph-radosgw
num_units: 1
options:
source: *source
namespace-tenants: True
to:
- '3'
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
num_units: 3
constraints: "mem=2048"
storage:
osd-devices: 'cinder,10G'
options:
source: *source
osd-devices: '/srv/ceph /dev/test-non-existent'
to:
- '4'
- '5'
- '6'
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
num_units: 3
options:
source: *source
to:
- '7'
- '8'
- '9'
keystone:
expose: True
charm: cs:~openstack-charmers-next/keystone
num_units: 1
options:
openstack-origin: *source
to:
- '10'
vault-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
vault:
charm: cs:~openstack-charmers-next/vault
num_units: 1
to:
- '11'
relations:
- - 'keystone:shared-db'
- 'keystone-mysql-router:shared-db'
- - 'keystone-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'ceph-osd:mon'
- 'ceph-mon:osd'
- - 'ceph-radosgw:mon'
- 'ceph-mon:radosgw'
- - 'ceph-radosgw:identity-service'
- 'keystone:identity-service'
- - 'vault-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'vault:shared-db'
- 'vault-mysql-router:shared-db'
- - 'keystone:certificates'
- 'vault:certificates'
- - 'ceph-radosgw:certificates'
- 'vault:certificates'

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

@ -0,0 +1,116 @@
options:
source: &source 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':
applications:
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: *source
to:
- '0'
- '1'
- '2'
ceph-radosgw:
charm: ceph-radosgw
num_units: 1
options:
source: *source
to:
- '3'
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
num_units: 3
constraints: "mem=2048"
storage:
osd-devices: 'cinder,10G'
options:
source: *source
osd-devices: '/srv/ceph /dev/test-non-existent'
to:
- '4'
- '5'
- '6'
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
num_units: 3
options:
source: *source
to:
- '7'
- '8'
- '9'
keystone:
expose: True
charm: cs:~openstack-charmers-next/keystone
num_units: 1
options:
openstack-origin: *source
to:
- '10'
vault-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
vault:
charm: cs:~openstack-charmers-next/vault
num_units: 1
to:
- '11'
relations:
- - 'keystone:shared-db'
- 'keystone-mysql-router:shared-db'
- - 'keystone-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'ceph-osd:mon'
- 'ceph-mon:osd'
- - 'ceph-radosgw:mon'
- 'ceph-mon:radosgw'
- - 'ceph-radosgw:identity-service'
- 'keystone:identity-service'
- - 'vault-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'vault:shared-db'
- 'vault-mysql-router:shared-db'
- - 'keystone:certificates'
- 'vault:certificates'
- - 'ceph-radosgw:certificates'
- 'vault:certificates'

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

@ -0,0 +1,117 @@
options:
source: &source 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':
applications:
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: *source
to:
- '0'
- '1'
- '2'
ceph-radosgw:
charm: ceph-radosgw
num_units: 1
options:
source: *source
namespace-tenants: True
to:
- '3'
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
num_units: 3
constraints: "mem=2048"
storage:
osd-devices: 'cinder,10G'
options:
source: *source
osd-devices: '/srv/ceph /dev/test-non-existent'
to:
- '4'
- '5'
- '6'
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
num_units: 3
options:
source: *source
to:
- '7'
- '8'
- '9'
keystone:
expose: True
charm: cs:~openstack-charmers-next/keystone
num_units: 1
options:
openstack-origin: *source
to:
- '10'
vault-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
vault:
charm: cs:~openstack-charmers-next/vault
num_units: 1
to:
- '11'
relations:
- - 'keystone:shared-db'
- 'keystone-mysql-router:shared-db'
- - 'keystone-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'ceph-osd:mon'
- 'ceph-mon:osd'
- - 'ceph-radosgw:mon'
- 'ceph-mon:radosgw'
- - 'ceph-radosgw:identity-service'
- 'keystone:identity-service'
- - 'vault-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'vault:shared-db'
- 'vault-mysql-router:shared-db'
- - 'keystone:certificates'
- 'vault:certificates'
- - 'ceph-radosgw:certificates'
- 'vault:certificates'

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

@ -0,0 +1,116 @@
options:
source: &source 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':
applications:
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: *source
to:
- '0'
- '1'
- '2'
ceph-radosgw:
charm: ceph-radosgw
num_units: 1
options:
source: *source
to:
- '3'
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
num_units: 3
constraints: "mem=2048"
storage:
osd-devices: 'cinder,10G'
options:
source: *source
osd-devices: '/srv/ceph /dev/test-non-existent'
to:
- '4'
- '5'
- '6'
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
num_units: 3
options:
source: *source
to:
- '7'
- '8'
- '9'
keystone:
expose: True
charm: cs:~openstack-charmers-next/keystone
num_units: 1
options:
openstack-origin: *source
to:
- '10'
vault-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
vault:
charm: cs:~openstack-charmers-next/vault
num_units: 1
to:
- '11'
relations:
- - 'keystone:shared-db'
- 'keystone-mysql-router:shared-db'
- - 'keystone-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'ceph-osd:mon'
- 'ceph-mon:osd'
- - 'ceph-radosgw:mon'
- 'ceph-mon:radosgw'
- - 'ceph-radosgw:identity-service'
- 'keystone:identity-service'
- - 'vault-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'vault:shared-db'
- 'vault-mysql-router:shared-db'
- - 'keystone:certificates'
- 'vault:certificates'
- - 'ceph-radosgw:certificates'
- 'vault:certificates'

17
tests/tests.yaml
View File

@ -1,7 +1,10 @@
charm_name: ceph-radosgw
gate_bundles:
- vault: groovy-victoria
- vault: groovy-victoria-namespaced
- vault: focal-wallaby
- vault: focal-wallaby-namespaced
- vault: focal-victoria
- vault: focal-victoria-namespaced
- vault: focal-ussuri-ec
@ -17,8 +20,10 @@ gate_bundles:
- vault: bionic-queens-namespaced
- xenial-mitaka
- xenial-mitaka-namespaced
smoke_bundles:
- vault: bionic-ussuri
- vault: focal-ussuri
dev_bundles:
- trusty-mitaka
- xenial-ocata
@ -28,13 +33,18 @@ dev_bundles:
- bionic-rocky-multisite
- vault: bionic-rocky
- vault: bionic-rocky-namespaced
- vault: hirsute-wallaby
- vault: hirsute-wallaby-namespaced
target_deploy_status:
vault:
workload-status: blocked
workload-status-message: Vault needs to be initialized
configure:
- vault:
- zaza.openstack.charm_tests.vault.setup.auto_initialize
tests:
- zaza.openstack.charm_tests.ceph.tests.CephRGWTest
- vault:
@ -42,7 +52,8 @@ tests:
- zaza.openstack.charm_tests.swift.tests.S3APITest
- zaza.openstack.charm_tests.ceph.tests.CheckPoolTypes
- zaza.openstack.charm_tests.ceph.tests.BlueStoreCompressionCharmOperation
tests_options:
force_deploy:
- groovy-victoria
- groovy-victoria-namespaced
- hirsute-wallaby
- hirsute-wallaby-namespaced