openstack
/
charm-masakari
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: I75d4112af25ae1980e9901b35325c798040e7294
This commit is contained in:
Alex Kavanagh 2024-02-09 18:15:47 +00:00
parent ec407665cb
commit b902a59fa7
9 changed files with 74 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
charmcraft.yaml
View File

@ -22,9 +22,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]

6
src/metadata.yaml
View File

@ -8,8 +8,6 @@ description: |
provisioning process down, and nova-compute host failure. Masakari also
provides an API service to manage and control the automated rescue mechanism.
tags:
- openstack
- openstack
series:
- jammy
- lunar
- mantic
- jammy

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

@ -83,7 +83,7 @@ applications:
worker-multiplier: 0.25
to:
- '3'
channel: latest/edge
channel: 2024.1/edge
cinder:
charm: ch:cinder
@ -94,7 +94,7 @@ applications:
glance-api-version: 2
to:
- '4'
channel: latest/edge
channel: 2024.1/edge
keystone:
charm: ch:keystone
@ -105,7 +105,7 @@ applications:
worker-multiplier: 0.25
to:
- '5'
channel: latest/edge
channel: 2024.1/edge
neutron-api:
charm: ch:neutron-api
@ -118,7 +118,7 @@ applications:
worker-multiplier: 0.25
to:
- '6'
channel: latest/edge
channel: 2024.1/edge
neutron-gateway:
charm: ch:neutron-gateway
@ -129,12 +129,12 @@ applications:
worker-multiplier: 0.25
to:
- '7'
channel: latest/edge
channel: 2024.1/edge
neutron-openvswitch:
charm: ch:neutron-openvswitch
num_units: 0
channel: latest/edge
channel: 2024.1/edge
nova-cloud-controller:
charm: ch:nova-cloud-controller
@ -146,7 +146,7 @@ applications:
debug: true
to:
- '23'
channel: latest/edge
channel: 2024.1/edge
nova-compute:
charm: ch:nova-compute
@ -167,7 +167,7 @@ applications:
- '8'
- '9'
- '10'
channel: latest/edge
channel: 2024.1/edge
rabbitmq-server:
charm: ch:rabbitmq-server
@ -196,7 +196,7 @@ applications:
- '15'
- '16'
- '17'
channel: latest/edge
channel: reef/edge
ceph-osd:
charm: ch:ceph-osd
@ -210,15 +210,15 @@ applications:
- '18'
- '19'
- '20'
channel: latest/edge
channel: reef/edge
cinder-ceph:
charm: ch:cinder-ceph
channel: latest/edge
channel: 2024.1/edge
masakari-monitors:
charm: ch:masakari-monitors
channel: latest/edge
channel: 2024.1/edge
hacluster:
charm: ch:hacluster
@ -248,7 +248,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '22'
channel: latest/edge
channel: 2024.1/edge
relations:

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

@ -83,7 +83,7 @@ applications:
worker-multiplier: 0.25
to:
- '3'
channel: latest/edge
channel: 2024.1/edge
cinder:
charm: ch:cinder
@ -94,7 +94,7 @@ applications:
glance-api-version: 2
to:
- '4'
channel: latest/edge
channel: 2024.1/edge
keystone:
charm: ch:keystone
@ -105,7 +105,7 @@ applications:
worker-multiplier: 0.25
to:
- '5'
channel: latest/edge
channel: 2024.1/edge
neutron-api:
charm: ch:neutron-api
@ -118,7 +118,7 @@ applications:
worker-multiplier: 0.25
to:
- '6'
channel: latest/edge
channel: 2024.1/edge
neutron-gateway:
charm: ch:neutron-gateway
@ -129,12 +129,12 @@ applications:
worker-multiplier: 0.25
to:
- '7'
channel: latest/edge
channel: 2024.1/edge
neutron-openvswitch:
charm: ch:neutron-openvswitch
num_units: 0
channel: latest/edge
channel: 2024.1/edge
nova-cloud-controller:
charm: ch:nova-cloud-controller
@ -146,7 +146,7 @@ applications:
debug: true
to:
- '23'
channel: latest/edge
channel: 2024.1/edge
nova-compute:
charm: ch:nova-compute
@ -167,7 +167,7 @@ applications:
- '8'
- '9'
- '10'
channel: latest/edge
channel: 2024.1/edge
rabbitmq-server:
charm: ch:rabbitmq-server
@ -196,7 +196,7 @@ applications:
- '15'
- '16'
- '17'
channel: latest/edge
channel: reef/edge
ceph-osd:
charm: ch:ceph-osd
@ -210,15 +210,15 @@ applications:
- '18'
- '19'
- '20'
channel: latest/edge
channel: reef/edge
cinder-ceph:
charm: ch:cinder-ceph
channel: latest/edge
channel: 2024.1/edge
masakari-monitors:
charm: ch:masakari-monitors
channel: latest/edge
channel: 2024.1/edge
hacluster:
charm: ch:hacluster
@ -248,7 +248,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '22'
channel: latest/edge
channel: 2024.1/edge
relations:

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

@ -1,9 +1,9 @@
variables:
openstack-origin: &openstack-origin distro
openstack-origin: &openstack-origin cloud:jammy-caracal
local_overlay_enabled: True
series: mantic
series: jammy
comment:
- 'machines section to decide order of deployment. database sooner = faster'
@ -83,7 +83,7 @@ applications:
worker-multiplier: 0.25
to:
- '3'
channel: latest/edge
channel: 2024.1/edge
cinder:
charm: ch:cinder
@ -94,7 +94,7 @@ applications:
glance-api-version: 2
to:
- '4'
channel: latest/edge
channel: 2024.1/edge
keystone:
charm: ch:keystone
@ -105,7 +105,7 @@ applications:
worker-multiplier: 0.25
to:
- '5'
channel: latest/edge
channel: 2024.1/edge
neutron-api:
charm: ch:neutron-api
@ -118,7 +118,7 @@ applications:
worker-multiplier: 0.25
to:
- '6'
channel: latest/edge
channel: 2024.1/edge
neutron-gateway:
charm: ch:neutron-gateway
@ -129,12 +129,12 @@ applications:
worker-multiplier: 0.25
to:
- '7'
channel: latest/edge
channel: 2024.1/edge
neutron-openvswitch:
charm: ch:neutron-openvswitch
num_units: 0
channel: latest/edge
channel: 2024.1/edge
nova-cloud-controller:
charm: ch:nova-cloud-controller
@ -146,7 +146,7 @@ applications:
debug: true
to:
- '23'
channel: latest/edge
channel: 2024.1/edge
nova-compute:
charm: ch:nova-compute
@ -167,7 +167,7 @@ applications:
- '8'
- '9'
- '10'
channel: latest/edge
channel: 2024.1/edge
rabbitmq-server:
charm: ch:rabbitmq-server
@ -196,7 +196,7 @@ applications:
- '15'
- '16'
- '17'
channel: latest/edge
channel: reef/edge
ceph-osd:
charm: ch:ceph-osd
@ -210,15 +210,15 @@ applications:
- '18'
- '19'
- '20'
channel: latest/edge
channel: reef/edge
cinder-ceph:
charm: ch:cinder-ceph
channel: latest/edge
channel: 2024.1/edge
masakari-monitors:
charm: ch:masakari-monitors
channel: latest/edge
channel: 2024.1/edge
hacluster:
charm: ch:hacluster
@ -248,7 +248,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '22'
channel: latest/edge
channel: 2024.1/edge
relations:

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

@ -3,7 +3,7 @@ variables:
local_overlay_enabled: True
series: lunar
series: noble
comment:
- 'machines section to decide order of deployment. database sooner = faster'
@ -83,7 +83,7 @@ applications:
worker-multiplier: 0.25
to:
- '3'
channel: latest/edge
channel: 2024.1/edge
cinder:
charm: ch:cinder
@ -94,7 +94,7 @@ applications:
glance-api-version: 2
to:
- '4'
channel: latest/edge
channel: 2024.1/edge
keystone:
charm: ch:keystone
@ -105,7 +105,7 @@ applications:
worker-multiplier: 0.25
to:
- '5'
channel: latest/edge
channel: 2024.1/edge
neutron-api:
charm: ch:neutron-api
@ -118,7 +118,7 @@ applications:
worker-multiplier: 0.25
to:
- '6'
channel: latest/edge
channel: 2024.1/edge
neutron-gateway:
charm: ch:neutron-gateway
@ -129,12 +129,12 @@ applications:
worker-multiplier: 0.25
to:
- '7'
channel: latest/edge
channel: 2024.1/edge
neutron-openvswitch:
charm: ch:neutron-openvswitch
num_units: 0
channel: latest/edge
channel: 2024.1/edge
nova-cloud-controller:
charm: ch:nova-cloud-controller
@ -146,7 +146,7 @@ applications:
debug: true
to:
- '23'
channel: latest/edge
channel: 2024.1/edge
nova-compute:
charm: ch:nova-compute
@ -167,7 +167,7 @@ applications:
- '8'
- '9'
- '10'
channel: latest/edge
channel: 2024.1/edge
rabbitmq-server:
charm: ch:rabbitmq-server
@ -196,7 +196,7 @@ applications:
- '15'
- '16'
- '17'
channel: latest/edge
channel: reef/edge
ceph-osd:
charm: ch:ceph-osd
@ -210,15 +210,15 @@ applications:
- '18'
- '19'
- '20'
channel: latest/edge
channel: reef/edge
cinder-ceph:
charm: ch:cinder-ceph
channel: latest/edge
channel: 2024.1/edge
masakari-monitors:
charm: ch:masakari-monitors
channel: latest/edge
channel: 2024.1/edge
hacluster:
charm: ch:hacluster
@ -248,7 +248,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '22'
channel: latest/edge
channel: 2024.1/edge
relations:

14
src/tests/tests.yaml
View File

@ -14,15 +14,12 @@ configure:
gate_bundles:
- jammy-antelope
dev_bundles:
- jammy-bobcat
- lunar-antelope
- mantic-bobcat
- jammy-caracal
dev_bundles:
- noble-caracal
smoke_bundles:
- jammy-antelope
- jammy-caracal
target_deploy_status:
easyrsa:
workload-status-message-prefix: Certificate Authority connected.
@ -42,5 +39,4 @@ target_deploy_status:
tests_options:
force_deploy:
- lunar-antelope
- mantic-bobcat
- noble-caracal

4
src/tox.ini
View File

@ -25,7 +25,9 @@ passenv =
CS_*
OS_*
TEST_*
deps = -r{toxinidir}/test-requirements.txt
deps =
-c {env:TEST_CONSTRAINTS_FILE:https://raw.githubusercontent.com/openstack-charmers/zaza-openstack-tests/master/constraints/constraints-2024.1.txt}
-r{toxinidir}/test-requirements.txt
[testenv:pep8]
basepython = python3

12
tox.ini
View File

@ -61,12 +61,16 @@ commands =
[testenv:py3]
basepython = python3
deps = -r{toxinidir}/test-requirements.txt
deps =
-c {env:TEST_CONSTRAINTS_FILE:https://raw.githubusercontent.com/openstack-charmers/zaza-openstack-tests/master/constraints/constraints-2024.1.txt}
-r{toxinidir}/test-requirements.txt
commands = stestr run --slowest {posargs}
[testenv:py310]
basepython = python3.10
deps = -r{toxinidir}/test-requirements.txt
deps =
-c {env:TEST_CONSTRAINTS_FILE:https://raw.githubusercontent.com/openstack-charmers/zaza-openstack-tests/master/constraints/constraints-2024.1.txt}
-r{toxinidir}/test-requirements.txt
commands = stestr run --slowest {posargs}
[testenv:pep8]
@ -79,7 +83,9 @@ commands = flake8 {posargs} src unit_tests
# Technique based heavily upon
# https://github.com/openstack/nova/blob/master/tox.ini
basepython = python3
deps = -r{toxinidir}/requirements.txt
deps =
-c {env:TEST_CONSTRAINTS_FILE:https://raw.githubusercontent.com/openstack-charmers/zaza-openstack-tests/master/constraints/constraints-2024.1.txt}
-r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
setenv =
{[testenv]setenv}