openstack
/
charm-aodh
Code Issues Proposed changes

Updates for caracal testing support 

These updates, on the master branch, are to support testing the caracal
packages and support of the charms for caracal.  They do NOT lock the charms
down, and don't change the testing branches to stable branches.

Change-Id: I23a62754654b725fffe8e40714a9aae391e2053c
This commit is contained in:
Alex Kavanagh 2024-02-06 20:07:35 +00:00
parent fa3d9da753
commit 2cc6041cd3
8 changed files with 35 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
charmcraft.yaml
View File

@ -4,6 +4,8 @@ parts:
charm:
source: src/
plugin: reactive
reactive-charm-build-arguments:
- --verbose
build-packages:
- libpython3-dev
build-snaps:
@ -22,9 +24,3 @@ bases:
- name: ubuntu
channel: "22.04"
architectures: [amd64, s390x, ppc64el, arm64]
- name: ubuntu
channel: "23.04"
architectures: [amd64, s390x, ppc64el, arm64]
- name: ubuntu
channel: "23.10"
architectures: [amd64, s390x, ppc64el, arm64]

2
osci.yaml
View File

@ -6,4 +6,4 @@
needs_charm_build: true
charm_build_name: aodh
build_type: charmcraft
charmcraft_channel: 2.1/stable
charmcraft_channel: 2.x/stable

6
src/metadata.yaml
View File

@ -12,11 +12,9 @@ description: |
Aodh provides the Alarming service as part of OpenStack telemetry.
docs: https://discourse.charmhub.io/t/aodh-docs-index/11004
tags:
- openstack
- openstack
series:
- jammy
- lunar
- mantic
- jammy
subordinate: false
requires:
mongodb:

10
src/tests/bundles/jammy-antelope.yaml
View File

@ -73,7 +73,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '5'
channel: latest/edge
channel: 2024.1/edge
ceilometer:
charm: ch:ceilometer
@ -82,7 +82,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '6'
channel: latest/edge
channel: 2024.1/edge
ceph-osd:
charm: ch:ceph-osd
@ -93,7 +93,7 @@ applications:
- '7'
- '8'
- '9'
channel: latest/edge
channel: reef/edge
ceph-mon:
charm: ch:ceph-mon
@ -105,7 +105,7 @@ applications:
- '10'
- '11'
- '12'
channel: latest/edge
channel: reef/edge
gnocchi:
charm: ch:gnocchi
@ -114,7 +114,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '13'
channel: latest/edge
channel: 2024.1/edge
memcached:
charm: ch:memcached

10
src/tests/bundles/jammy-bobcat.yaml
View File

@ -73,7 +73,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '5'
channel: latest/edge
channel: 2024.1/edge
ceilometer:
charm: ch:ceilometer
@ -82,7 +82,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '6'
channel: latest/edge
channel: 2024.1/edge
ceph-osd:
charm: ch:ceph-osd
@ -93,7 +93,7 @@ applications:
- '7'
- '8'
- '9'
channel: latest/edge
channel: reef/edge
ceph-mon:
charm: ch:ceph-mon
@ -105,7 +105,7 @@ applications:
- '10'
- '11'
- '12'
channel: latest/edge
channel: reef/edge
gnocchi:
charm: ch:gnocchi
@ -114,7 +114,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '13'
channel: latest/edge
channel: 2024.1/edge
memcached:
charm: ch:memcached

16
src/tests/bundles/mantic-bobcat.yaml → src/tests/bundles/jammy-caracal.yaml
View File

@ -1,9 +1,9 @@
local_overlay_enabled: False
variables:
openstack-origin: &openstack-origin distro
openstack-origin: &openstack-origin cloud:jammy-caracal
series: mantic
series: jammy
machines:
0:
@ -73,7 +73,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '5'
channel: latest/edge
channel: 2024.1/edge
ceilometer:
charm: ch:ceilometer
@ -82,7 +82,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '6'
channel: latest/edge
channel: 2024.1/edge
ceph-osd:
charm: ch:ceph-osd
@ -93,7 +93,7 @@ applications:
- '7'
- '8'
- '9'
channel: latest/edge
channel: reef/edge
ceph-mon:
charm: ch:ceph-mon
@ -105,7 +105,7 @@ applications:
- '10'
- '11'
- '12'
channel: latest/edge
channel: reef/edge
gnocchi:
charm: ch:gnocchi
@ -114,12 +114,12 @@ applications:
openstack-origin: *openstack-origin
to:
- '13'
channel: latest/edge
channel: 2024.1/edge
memcached:
charm: ch:memcached
num_units: 1
# Note that holding memcached at focal as it's not available at mantic yet.
# Note that holding memcached at focal as it's not available at jammy yet.
series: focal
to:
- '14'

14
src/tests/bundles/lunar-antelope.yaml → src/tests/bundles/noble-caracal.yaml
View File

@ -3,7 +3,7 @@ local_overlay_enabled: False
variables:
openstack-origin: &openstack-origin distro
series: lunar
series: noble
machines:
0:
@ -73,7 +73,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '5'
channel: latest/edge
channel: 2024.1/edge
ceilometer:
charm: ch:ceilometer
@ -82,7 +82,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '6'
channel: latest/edge
channel: 2024.1/edge
ceph-osd:
charm: ch:ceph-osd
@ -93,7 +93,7 @@ applications:
- '7'
- '8'
- '9'
channel: latest/edge
channel: reef/edge
ceph-mon:
charm: ch:ceph-mon
@ -105,7 +105,7 @@ applications:
- '10'
- '11'
- '12'
channel: latest/edge
channel: reef/edge
gnocchi:
charm: ch:gnocchi
@ -114,12 +114,12 @@ applications:
openstack-origin: *openstack-origin
to:
- '13'
channel: latest/edge
channel: 2024.1/edge
memcached:
charm: ch:memcached
num_units: 1
# Note that holding memcached at focal as it's not available at lunar yet.
# Note that holding memcached at focal as it's not available at jammy yet.
series: focal
to:
- '14'

13
src/tests/tests.yaml
View File

@ -2,12 +2,12 @@ charm_name: aodh
gate_bundles:
- jammy-antelope
dev_bundles:
- jammy-bobcat
- lunar-antelope
- mantic-bobcat
- jammy-caracal
dev_bundles:
- noble-caracal
smoke_bundles:
- jammy-yoga
- jammy-caracal
tests:
- zaza.openstack.charm_tests.aodh.tests.AodhTest
configure:
@ -26,7 +26,4 @@ tests_options:
force_deploy:
# nrpe charm doesn't support jammy+ and needs to be force installed
# https://bugs.launchpad.net/charm-nrpe/+bug/1968008
- jammy-antelope
- jammy-bobcat
- lunar-antelope
- mantic-bobcat
- noble-caracal