openstack
/
charm-ceph-mon
Code Issues Proposed changes

Testing: use mysql and rabbitmq from LTS 

For better stability use LTS series for rabbitmq and mysql when
testing instead of interim releases.

Also remove xena (non-lts) from tests and yoga as a source default

Change-Id: Ie443c55dc4cc1b7f63eacfee79b28f210f1277e4
This commit is contained in:
Peter Sabaini 2023-05-11 15:35:27 +02:00
parent f172b8cd1e
commit 357421f391
5 changed files with 50 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config.yaml
View File

@ -10,7 +10,7 @@ options:
If set to True, supporting services will log to syslog.
source:
type: string
default: yoga
default: distro
description: |
Optional configuration to support use of additional sources such as:
.

1
osci.yaml
View File

@ -2,7 +2,6 @@
templates:
- charm-unit-jobs-py38
- charm-unit-jobs-py310
- charm-xena-functional-jobs
- charm-yoga-functional-jobs
- charm-zed-functional-jobs
- charm-functional-jobs

30
tests/bundles/jammy-antelope.yaml
View File

@ -35,30 +35,35 @@ applications:
keystone-mysql-router:
charm: ch:mysql-router
channel: 8.0.19/edge
channel: 8.0/edge
glance-mysql-router:
charm: ch:mysql-router
channel: 8.0.19/edge
channel: 8.0/edge
cinder-mysql-router:
charm: ch:mysql-router
channel: 8.0.19/edge
channel: 8.0/edge
nova-cloud-controller-mysql-router:
charm: ch:mysql-router
channel: 8.0.19/edge
channel: 8.0/edge
placement-mysql-router:
charm: ch:mysql-router
channel: 8.0.19/edge
channel: 8.0/edge
mysql-innodb-cluster:
charm: ch:mysql-innodb-cluster
num_units: 3
options:
source: *openstack-origin
to:
- '0'
- '1'
- '2'
channel: 8.0.19/edge
channel: 8.0/edge
rabbitmq-server:
charm: ch:rabbitmq-server
num_units: 1
to:
- '9'
channel: 3.9/edge
ceph-osd:
charm: ch:ceph-osd
@ -95,15 +100,6 @@ applications:
to:
- '17'
rabbitmq-server:
charm: ch:rabbitmq-server
num_units: 1
options:
source: *openstack-origin
to:
- '9'
channel: 3.9/edge
keystone:
expose: True
charm: ch:keystone

16
tests/bundles/jammy-zed.yaml
View File

@ -35,30 +35,28 @@ applications:
keystone-mysql-router:
charm: ch:mysql-router
channel: 8.0.19/edge
channel: 8.0/edge
glance-mysql-router:
charm: ch:mysql-router
channel: 8.0.19/edge
channel: 8.0/edge
cinder-mysql-router:
charm: ch:mysql-router
channel: 8.0.19/edge
channel: 8.0/edge
nova-cloud-controller-mysql-router:
charm: ch:mysql-router
channel: 8.0.19/edge
channel: 8.0/edge
placement-mysql-router:
charm: ch:mysql-router
channel: 8.0.19/edge
channel: 8.0/edge
mysql-innodb-cluster:
charm: ch:mysql-innodb-cluster
num_units: 3
options:
source: *openstack-origin
to:
- '0'
- '1'
- '2'
channel: 8.0.19/edge
channel: 8.0/edge
ceph-osd:
charm: ch:ceph-osd
@ -98,8 +96,6 @@ applications:
rabbitmq-server:
charm: ch:rabbitmq-server
num_units: 1
options:
source: *openstack-origin
to:
- '9'
channel: 3.9/edge

58
tests/bundles/lunar-antelope.yaml
View File

@ -1,5 +1,7 @@
variables:
openstack-origin: &openstack-origin distro
# use infra (mysql, rabbit) from lts for stability
infra-series: &infra-series jammy
series: lunar
@ -8,11 +10,15 @@ comment:
machines:
'0':
constraints: mem=3072M
series: *infra-series
'1':
constraints: mem=3072M
series: *infra-series
'2':
constraints: mem=3072M
series: *infra-series
'3':
series: *infra-series
'4':
'5':
'6':
@ -26,38 +32,43 @@ machines:
'14':
'15':
'16':
series: focal
'17':
series: focal
applications:
keystone-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
glance-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
cinder-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
nova-cloud-controller-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
placement-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
mysql-innodb-cluster:
charm: ch:mysql-innodb-cluster
num_units: 3
options:
source: *openstack-origin
to:
- '0'
- '1'
- '2'
channel: latest/edge
channel: 8.0/edge
rabbitmq-server:
charm: ch:rabbitmq-server
num_units: 1
to:
- '3'
channel: 3.9/edge
ceph-osd:
charm: ch:ceph-osd
@ -68,9 +79,9 @@ applications:
source: *openstack-origin
osd-devices: '/dev/test-non-existent'
to:
- '3'
- '4'
- '5'
- '6'
channel: quincy/edge
ceph-mon:
@ -81,9 +92,9 @@ applications:
source: *openstack-origin
monitor-count: '3'
to:
- '6'
- '7'
- '8'
- '9'
ceph-fs:
charm: ch:ceph-fs
@ -92,16 +103,7 @@ applications:
source: *openstack-origin
channel: quincy/edge
to:
- '17'
rabbitmq-server:
charm: ch:rabbitmq-server
num_units: 1
options:
source: *openstack-origin
to:
- '9'
channel: latest/edge
- '10'
keystone:
expose: True
@ -110,7 +112,7 @@ applications:
options:
openstack-origin: *openstack-origin
to:
- '10'
- '11'
channel: 2023.1/edge
nova-compute:
@ -120,7 +122,7 @@ applications:
openstack-origin: *openstack-origin
libvirt-image-backend: rbd
to:
- '11'
- '12'
channel: 2023.1/edge
glance:
@ -130,7 +132,7 @@ applications:
options:
openstack-origin: *openstack-origin
to:
- '12'
- '13'
channel: 2023.1/edge
cinder:
@ -142,7 +144,7 @@ applications:
glance-api-version: '2'
openstack-origin: *openstack-origin
to:
- '13'
- '14'
channel: 2023.1/edge
cinder-ceph:
@ -156,7 +158,7 @@ applications:
options:
openstack-origin: *openstack-origin
to:
- '14'
- '15'
channel: 2023.1/edge
placement:
@ -165,7 +167,7 @@ applications:
options:
openstack-origin: *openstack-origin
to:
- '15'
- '16'
channel: 2023.1/edge
prometheus2:
@ -173,7 +175,7 @@ applications:
num_units: 1
series: focal
to:
- '16'
- '17'
relations:
- - 'nova-compute:amqp'