openstack/charm-gnocchi
Code Issues Proposed changes

Test bundles for focal-wallaby and hirsute-wallaby

Browse Source 
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: I4df3a7b4e1ab5aa7660424c4713f175df9f3f711
This commit is contained in:
Alex Kavanagh 2021-03-04 11:28:57 +00:00 committed by Aurelien Lourot
parent 33fea30a1e
commit 51ba22235f
6 changed files with 601 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
osci.yaml
View File

@ -9,13 +9,17 @@
- bionic-ussuri
- focal-ussuri
- focal-victoria
- focal-wallaby
- groovy-victoria
- hirsute-wallaby
- test-s3-bionic-stein-s3
- test-s3-bionic-train-s3
- test-s3-bionic-ussuri-s3
- test-s3-focal-ussuri-s3
- test-s3-focal-victoria-s3
- test-s3-focal-wallaby-s3
- test-s3-groovy-victoria-s3
- test-s3-hirsute-wallaby-s3
vars:
needs_charm_build: true
charm_build_name: gnocchi
@ -51,9 +55,21 @@
dependencies: *smoke-jobs
vars:
tox_extra_args: test-s3:focal-victoria-s3
- job:
name: test-s3-focal-wallaby-s3
parent: func-target
dependencies: *smoke-jobs
vars:
tox_extra_args: test-s3:focal-wallaby-s3
- job:
name: test-s3-groovy-victoria-s3
parent: func-target
dependencies: *smoke-jobs
vars:
tox_extra_args: test-s3:groovy-victoria-s3
tox_extra_args: test-s3:groovy-victoria-s3
- job:
name: test-s3-hirsute-wallaby-s3
parent: func-target
dependencies: *smoke-jobs
vars:
tox_extra_args: test-s3:hirsute-wallaby-s3

145
src/tests/bundles/focal-wallaby-s3.yaml Normal file
View File

@ -0,0 +1,145 @@
variables:
openstack-origin: &openstack-origin cloud:focal-wallaby
series: &series focal
machines:
0:
constraints: "mem=3072M"
1:
constraints: "mem=3072M"
2:
constraints: "mem=3072M"
3: {}
4: {}
5: {}
6: {}
7: {}
8: {}
9: {}
10:
series: bionic
# We specify machine placements for these to improve iteration
# time, given that machine "0" comes up way before machine "6"
applications:
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
gnocchi-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
vault-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: cs:~openstack-charmers-next/rabbitmq-server
num_units: 1
options:
source: *openstack-origin
to:
- '3'
keystone:
charm: cs:~openstack-charmers-next/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '4'
ceilometer:
charm: cs:~openstack-charmers-next/ceilometer
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '5'
gnocchi:
series: *series
charm: ../../../gnocchi
num_units: 1
options:
openstack-origin: *openstack-origin
storage-backend: s3
to:
- '6'
memcached:
charm: cs:~memcached-team/memcached
num_units: 1
# holding at bionic as memcached doesn't support focal yet
series: bionic
to:
- '10'
#swift-proxy is used to test gnocchi against an S3 storage backend
swift-proxy:
charm: swift-proxy
num_units: 1
options:
zone-assignment: manual
replicas: 1
swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae
openstack-origin: *openstack-origin
to:
- '7'
swift-storage:
charm: cs:~openstack-charmers-next/swift-storage
num_units: 1
storage:
block-devices: 'cinder,10G'
options:
openstack-origin: *openstack-origin
zone: 1
to:
- '8'
vault:
charm: cs:~openstack-charmers-next/vault
num_units: 1
series: *series
to:
- '9'
relations:
- - keystone:shared-db
- keystone-mysql-router:shared-db
- - keystone-mysql-router:db-router
- mysql-innodb-cluster:db-router
- - gnocchi:shared-db
- gnocchi-mysql-router:shared-db
- - gnocchi-mysql-router:db-router
- mysql-innodb-cluster:db-router
- - ceilometer:amqp
- rabbitmq-server:amqp
- - ceilometer:identity-credentials
- keystone:identity-credentials
- - ceilometer:identity-notifications
- keystone:identity-notifications
- - ceilometer:metric-service
- gnocchi:metric-service
- - gnocchi:identity-service
- keystone:identity-service
- - gnocchi:coordinator-memcached
- memcached:cache
- - swift-proxy:identity-service
- keystone:identity-service
- - swift-storage:swift-storage
- swift-proxy:swift-storage
- - vault:shared-db
- vault-mysql-router:shared-db
- - vault-mysql-router:db-router
- mysql-innodb-cluster:db-router
- - vault:certificates
- swift-proxy:certificates
- - vault:certificates
- gnocchi:certificates
- - vault:certificates
- ceilometer:certificates
- - vault:certificates
- keystone:certificates
- - vault:certificates
- rabbitmq-server:certificates

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

@ -0,0 +1,144 @@
variables:
openstack-origin: &openstack-origin cloud:focal-wallaby
series: &series focal
machines:
'0':
constraints: mem=3072M
'1':
constraints: mem=3072M
'2':
constraints: mem=3072M
'3':
'4':
'5':
'6':
'7':
'8':
'9':
'10':
'11':
'12':
'13':
series: bionic
# We specify machine placements for these to improve iteration
# time, given that machine "0" comes up way before machine "6"
applications:
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
gnocchi-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: cs:~openstack-charmers-next/rabbitmq-server
num_units: 1
options:
source: *openstack-origin
to:
- '3'
keystone:
charm: cs:~openstack-charmers-next/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '4'
ceilometer:
charm: cs:~openstack-charmers-next/ceilometer
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '5'
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
num_units: 3
storage:
osd-devices: 'cinder,10G'
options:
source: *openstack-origin
to:
- '6'
- '7'
- '8'
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
num_units: 3
options:
expected-osd-count: 3
monitor-count: '3'
source: *openstack-origin
to:
- '9'
- '10'
- '11'
gnocchi:
series: *series
charm: ../../../gnocchi
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '12'
memcached:
charm: cs:~memcached-team/memcached
num_units: 1
# holding at bionic as memcached doesn't support focal yet
series: bionic
to:
- '13'
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'
- - 'ceilometer:amqp'
- 'rabbitmq-server:amqp'
- - 'ceilometer:identity-credentials'
- 'keystone:identity-credentials'
- - 'ceilometer:identity-notifications'
- 'keystone:identity-notifications'
- - 'ceilometer:metric-service'
- 'gnocchi:metric-service'
- - 'gnocchi:identity-service'
- 'keystone:identity-service'
- - 'gnocchi:shared-db'
- 'gnocchi-mysql-router:shared-db'
- - 'gnocchi-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'gnocchi:storage-ceph'
- 'ceph-mon:client'
- - 'gnocchi:coordinator-memcached'
- 'memcached:cache'

145
src/tests/bundles/hirsute-wallaby-s3.yaml Normal file
View File

@ -0,0 +1,145 @@
variables:
openstack-origin: &openstack-origin distro
series: &series hirsute
machines:
0:
constraints: "mem=3072M"
1:
constraints: "mem=3072M"
2:
constraints: "mem=3072M"
3: {}
4: {}
5: {}
6: {}
7: {}
8: {}
9: {}
10:
series: bionic
# We specify machine placements for these to improve iteration
# time, given that machine "0" comes up way before machine "6"
applications:
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
gnocchi-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
vault-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: cs:~openstack-charmers-next/rabbitmq-server
num_units: 1
options:
source: *openstack-origin
to:
- '3'
keystone:
charm: cs:~openstack-charmers-next/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '4'
ceilometer:
charm: cs:~openstack-charmers-next/ceilometer
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '5'
gnocchi:
series: *series
charm: ../../../gnocchi
num_units: 1
options:
openstack-origin: *openstack-origin
storage-backend: s3
to:
- '6'
memcached:
charm: cs:~memcached-team/memcached
num_units: 1
# holding at bionic as memcached doesn't support focal/groovy yet
series: bionic
to:
- '10'
#swift-proxy is used to test gnocchi against an S3 storage backend
swift-proxy:
charm: swift-proxy
num_units: 1
options:
zone-assignment: manual
replicas: 1
swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae
openstack-origin: *openstack-origin
to:
- '7'
swift-storage:
charm: cs:~openstack-charmers-next/swift-storage
num_units: 1
storage:
block-devices: 'cinder,10G'
options:
openstack-origin: *openstack-origin
zone: 1
to:
- '8'
vault:
charm: cs:~openstack-charmers-next/vault
num_units: 1
series: *series
to:
- '9'
relations:
- - keystone:shared-db
- keystone-mysql-router:shared-db
- - keystone-mysql-router:db-router
- mysql-innodb-cluster:db-router
- - gnocchi:shared-db
- gnocchi-mysql-router:shared-db
- - gnocchi-mysql-router:db-router
- mysql-innodb-cluster:db-router
- - ceilometer:amqp
- rabbitmq-server:amqp
- - ceilometer:identity-credentials
- keystone:identity-credentials
- - ceilometer:identity-notifications
- keystone:identity-notifications
- - ceilometer:metric-service
- gnocchi:metric-service
- - gnocchi:identity-service
- keystone:identity-service
- - gnocchi:coordinator-memcached
- memcached:cache
- - swift-proxy:identity-service
- keystone:identity-service
- - swift-storage:swift-storage
- swift-proxy:swift-storage
- - vault:shared-db
- vault-mysql-router:shared-db
- - vault-mysql-router:db-router
- mysql-innodb-cluster:db-router
- - vault:certificates
- swift-proxy:certificates
- - vault:certificates
- gnocchi:certificates
- - vault:certificates
- ceilometer:certificates
- - vault:certificates
- keystone:certificates
- - vault:certificates
- rabbitmq-server:certificates

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

@ -0,0 +1,144 @@
variables:
openstack-origin: &openstack-origin distro
series: &series hirsute
machines:
'0':
constraints: mem=3072M
'1':
constraints: mem=3072M
'2':
constraints: mem=3072M
'3':
'4':
'5':
'6':
'7':
'8':
'9':
'10':
'11':
'12':
'13':
series: bionic
# We specify machine placements for these to improve iteration
# time, given that machine "0" comes up way before machine "6"
applications:
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
gnocchi-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: cs:~openstack-charmers-next/rabbitmq-server
num_units: 1
options:
source: *openstack-origin
to:
- '3'
keystone:
charm: cs:~openstack-charmers-next/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '4'
ceilometer:
charm: cs:~openstack-charmers-next/ceilometer
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '5'
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
num_units: 3
storage:
osd-devices: 'cinder,10G'
options:
source: *openstack-origin
to:
- '6'
- '7'
- '8'
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
num_units: 3
options:
expected-osd-count: 3
monitor-count: '3'
source: *openstack-origin
to:
- '9'
- '10'
- '11'
gnocchi:
series: *series
charm: ../../../gnocchi
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '12'
memcached:
charm: cs:~memcached-team/memcached
num_units: 1
# holding at bionic as memcached doesn't support focal/groovy yet
series: bionic
to:
- '13'
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'
- - 'ceilometer:amqp'
- 'rabbitmq-server:amqp'
- - 'ceilometer:identity-credentials'
- 'keystone:identity-credentials'
- - 'ceilometer:identity-notifications'
- 'keystone:identity-notifications'
- - 'ceilometer:metric-service'
- 'gnocchi:metric-service'
- - 'gnocchi:identity-service'
- 'keystone:identity-service'
- - 'gnocchi:shared-db'
- 'gnocchi-mysql-router:shared-db'
- - 'gnocchi-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'gnocchi:storage-ceph'
- 'ceph-mon:client'
- - 'gnocchi:coordinator-memcached'
- 'memcached:cache'

8
src/tests/tests.yaml
View File

@ -7,12 +7,14 @@ gate_bundles:
- bionic-ussuri
- focal-ussuri
- focal-victoria
- focal-wallaby
- groovy-victoria
- test-s3: bionic-stein-s3
- test-s3: bionic-train-s3
- test-s3: bionic-ussuri-s3
- test-s3: focal-ussuri-s3
- test-s3: focal-victoria-s3
- test-s3: focal-wallaby-s3
- test-s3: groovy-victoria-s3
smoke_bundles:
- focal-ussuri
@ -21,6 +23,8 @@ dev_bundles:
- xenial-pike
- xenial-queens
- bionic-rocky
- hirsute-wallaby
- test-s3: hirsute-wallaby-s3
configure:
- zaza.openstack.charm_tests.ceilometer.setup.basic_setup
- test-s3:
@ -50,5 +54,5 @@ target_deploy_status:
workload-status-message: Mandatory S3 configuration parameters missing.
tests_options:
force_deploy:
- groovy-victoria
- groovy-victoria-s3
- hirsute-wallaby
- hirsute-wallaby-s3