openstack/charm-manila-ganesha
Code Issues Proposed changes

Updates for caracal testing support

Browse Source 
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: I93f3ff2e704073a47c4dc50603fd4ba6be01dc18
This commit is contained in:
Alex Kavanagh
2024-02-09 18:15:47 +00:00
parent fe8ba5b9be
commit ef7f5f52fe
9 changed files with 74 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
charmcraft.yaml
View File

@@ -52,67 +52,3 @@ bases:
- name: ubuntu
channel: "22.04"
architectures: [arm64]
- build-on:
- name: ubuntu
channel: "23.04"
architectures: [amd64]
run-on:
- name: ubuntu
channel: "23.04"
architectures: [amd64]
- build-on:
- name: ubuntu
channel: "23.04"
architectures: [s390x]
run-on:
- name: ubuntu
channel: "23.04"
architectures: [s390x]
- build-on:
- name: ubuntu
channel: "23.04"
architectures: [ppc64el]
run-on:
- name: ubuntu
channel: "23.04"
architectures: [ppc64el]
- build-on:
- name: ubuntu
channel: "23.04"
architectures: [arm64]
run-on:
- name: ubuntu
channel: "23.04"
architectures: [arm64]
- build-on:
- name: ubuntu
channel: "23.10"
architectures: [amd64]
run-on:
- name: ubuntu
channel: "23.10"
architectures: [amd64]
- build-on:
- name: ubuntu
channel: "23.10"
architectures: [s390x]
run-on:
- name: ubuntu
channel: "23.10"
architectures: [s390x]
- build-on:
- name: ubuntu
channel: "23.10"
architectures: [ppc64el]
run-on:
- name: ubuntu
channel: "23.10"
architectures: [ppc64el]
- build-on:
- name: ubuntu
channel: "23.10"
architectures: [arm64]
run-on:
- name: ubuntu
channel: "23.10"
architectures: [arm64]

8
src/metadata.yaml
View File

@@ -7,12 +7,10 @@ description: |
all these protocols concurrently. Manila-Ganesha allows connecting
a Manila server to a Ceph cluster via CephFS.
tags:
- storage
- file-servers
- storage
- file-servers
series:
- jammy
- lunar
- mantic
- jammy
subordinate: false
extra-bindings:
tenant-storage:

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

@@ -92,7 +92,7 @@ services:
- '6'
- '7'
- '8'
channel: latest/edge
channel: reef/edge
ceph-osd:
charm: ch:ceph-osd
@@ -105,7 +105,7 @@ services:
- '9'
- '10'
- '11'
channel: latest/edge
channel: reef/edge
ceph-fs:
charm: ch:ceph-fs
@@ -115,7 +115,7 @@ services:
to:
- '12'
- '13'
channel: latest/edge
channel: reef/edge
manila:
charm: ch:manila
@@ -126,7 +126,7 @@ services:
openstack-origin: *openstack-origin
to:
- '14'
channel: latest/edge
channel: 2024.1/edge
nova-cloud-controller:
charm: ch:nova-cloud-controller
@@ -136,7 +136,7 @@ services:
openstack-origin: *openstack-origin
to:
- '15'
channel: latest/edge
channel: 2024.1/edge
placement:
charm: ch:placement
@@ -145,7 +145,7 @@ services:
openstack-origin: *openstack-origin
to:
- '16'
channel: latest/edge
channel: 2024.1/edge
nova-compute:
charm: ch:nova-compute
@@ -159,7 +159,7 @@ services:
to:
- '17'
- '18'
channel: latest/edge
channel: 2024.1/edge
glance:
charm: ch:glance
@@ -168,7 +168,7 @@ services:
openstack-origin: *openstack-origin
to:
- '19'
channel: latest/edge
channel: 2024.1/edge
neutron-api:
charm: ch:neutron-api
@@ -181,11 +181,11 @@ services:
openstack-origin: *openstack-origin
to:
- '20'
channel: latest/edge
channel: 2024.1/edge
neutron-openvswitch:
charm: ch:neutron-openvswitch
channel: latest/edge
channel: 2024.1/edge
neutron-gateway:
charm: ch:neutron-gateway
@@ -195,7 +195,7 @@ services:
openstack-origin: *openstack-origin
to:
- '21'
channel: latest/edge
channel: 2024.1/edge
rabbitmq-server:
charm: ch:rabbitmq-server
@@ -211,7 +211,7 @@ services:
openstack-origin: *openstack-origin
to:
- '23'
channel: latest/edge
channel: 2024.1/edge
nrpe:
charm: ch:nrpe

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

@@ -92,7 +92,7 @@ services:
- '6'
- '7'
- '8'
channel: latest/edge
channel: reef/edge
ceph-osd:
charm: ch:ceph-osd
@@ -105,7 +105,7 @@ services:
- '9'
- '10'
- '11'
channel: latest/edge
channel: reef/edge
ceph-fs:
charm: ch:ceph-fs
@@ -115,7 +115,7 @@ services:
to:
- '12'
- '13'
channel: latest/edge
channel: reef/edge
manila:
charm: ch:manila
@@ -126,7 +126,7 @@ services:
openstack-origin: *openstack-origin
to:
- '14'
channel: latest/edge
channel: 2024.1/edge
nova-cloud-controller:
charm: ch:nova-cloud-controller
@@ -136,7 +136,7 @@ services:
openstack-origin: *openstack-origin
to:
- '15'
channel: latest/edge
channel: 2024.1/edge
placement:
charm: ch:placement
@@ -145,7 +145,7 @@ services:
openstack-origin: *openstack-origin
to:
- '16'
channel: latest/edge
channel: 2024.1/edge
nova-compute:
charm: ch:nova-compute
@@ -159,7 +159,7 @@ services:
to:
- '17'
- '18'
channel: latest/edge
channel: 2024.1/edge
glance:
charm: ch:glance
@@ -168,7 +168,7 @@ services:
openstack-origin: *openstack-origin
to:
- '19'
channel: latest/edge
channel: 2024.1/edge
neutron-api:
charm: ch:neutron-api
@@ -181,11 +181,11 @@ services:
openstack-origin: *openstack-origin
to:
- '20'
channel: latest/edge
channel: 2024.1/edge
neutron-openvswitch:
charm: ch:neutron-openvswitch
channel: latest/edge
channel: 2024.1/edge
neutron-gateway:
charm: ch:neutron-gateway
@@ -195,7 +195,7 @@ services:
openstack-origin: *openstack-origin
to:
- '21'
channel: latest/edge
channel: 2024.1/edge
rabbitmq-server:
charm: ch:rabbitmq-server
@@ -211,7 +211,7 @@ services:
openstack-origin: *openstack-origin
to:
- '23'
channel: latest/edge
channel: 2024.1/edge
nrpe:
charm: ch:nrpe

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'
@@ -75,7 +75,7 @@ services:
manila-ganesha-az1:
num_units: 3
charm: ../../../manila-ganesha_ubuntu-23.10-amd64.charm
charm: ../../../manila-ganesha_ubuntu-22.04-amd64.charm
options:
openstack-origin: *openstack-origin
to:
@@ -92,7 +92,7 @@ services:
- '6'
- '7'
- '8'
channel: latest/edge
channel: reef/edge
ceph-osd:
charm: ch:ceph-osd
@@ -105,7 +105,7 @@ services:
- '9'
- '10'
- '11'
channel: latest/edge
channel: reef/edge
ceph-fs:
charm: ch:ceph-fs
@@ -115,7 +115,7 @@ services:
to:
- '12'
- '13'
channel: latest/edge
channel: reef/edge
manila:
charm: ch:manila
@@ -126,7 +126,7 @@ services:
openstack-origin: *openstack-origin
to:
- '14'
channel: latest/edge
channel: 2024.1/edge
nova-cloud-controller:
charm: ch:nova-cloud-controller
@@ -136,7 +136,7 @@ services:
openstack-origin: *openstack-origin
to:
- '15'
channel: latest/edge
channel: 2024.1/edge
placement:
charm: ch:placement
@@ -145,7 +145,7 @@ services:
openstack-origin: *openstack-origin
to:
- '16'
channel: latest/edge
channel: 2024.1/edge
nova-compute:
charm: ch:nova-compute
@@ -159,7 +159,7 @@ services:
to:
- '17'
- '18'
channel: latest/edge
channel: 2024.1/edge
glance:
charm: ch:glance
@@ -168,7 +168,7 @@ services:
openstack-origin: *openstack-origin
to:
- '19'
channel: latest/edge
channel: 2024.1/edge
neutron-api:
charm: ch:neutron-api
@@ -181,11 +181,11 @@ services:
openstack-origin: *openstack-origin
to:
- '20'
channel: latest/edge
channel: 2024.1/edge
neutron-openvswitch:
charm: ch:neutron-openvswitch
channel: latest/edge
channel: 2024.1/edge
neutron-gateway:
charm: ch:neutron-gateway
@@ -195,7 +195,7 @@ services:
openstack-origin: *openstack-origin
to:
- '21'
channel: latest/edge
channel: 2024.1/edge
rabbitmq-server:
charm: ch:rabbitmq-server
@@ -211,7 +211,7 @@ services:
openstack-origin: *openstack-origin
to:
- '23'
channel: latest/edge
channel: 2024.1/edge
nrpe:
charm: ch:nrpe

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'
@@ -75,7 +75,7 @@ services:
manila-ganesha-az1:
num_units: 3
charm: ../../../manila-ganesha_ubuntu-23.04-amd64.charm
charm: ../../../manila-ganesha_ubuntu-22.04-amd64.charm
options:
openstack-origin: *openstack-origin
to:
@@ -92,7 +92,7 @@ services:
- '6'
- '7'
- '8'
channel: latest/edge
channel: reef/edge
ceph-osd:
charm: ch:ceph-osd
@@ -105,7 +105,7 @@ services:
- '9'
- '10'
- '11'
channel: latest/edge
channel: reef/edge
ceph-fs:
charm: ch:ceph-fs
@@ -115,7 +115,7 @@ services:
to:
- '12'
- '13'
channel: latest/edge
channel: reef/edge
manila:
charm: ch:manila
@@ -126,7 +126,7 @@ services:
openstack-origin: *openstack-origin
to:
- '14'
channel: latest/edge
channel: 2024.1/edge
nova-cloud-controller:
charm: ch:nova-cloud-controller
@@ -136,7 +136,7 @@ services:
openstack-origin: *openstack-origin
to:
- '15'
channel: latest/edge
channel: 2024.1/edge
placement:
charm: ch:placement
@@ -145,7 +145,7 @@ services:
openstack-origin: *openstack-origin
to:
- '16'
channel: latest/edge
channel: 2024.1/edge
nova-compute:
charm: ch:nova-compute
@@ -159,7 +159,7 @@ services:
to:
- '17'
- '18'
channel: latest/edge
channel: 2024.1/edge
glance:
charm: ch:glance
@@ -168,7 +168,7 @@ services:
openstack-origin: *openstack-origin
to:
- '19'
channel: latest/edge
channel: 2024.1/edge
neutron-api:
charm: ch:neutron-api
@@ -181,11 +181,11 @@ services:
openstack-origin: *openstack-origin
to:
- '20'
channel: latest/edge
channel: 2024.1/edge
neutron-openvswitch:
charm: ch:neutron-openvswitch
channel: latest/edge
channel: 2024.1/edge
neutron-gateway:
charm: ch:neutron-gateway
@@ -195,7 +195,7 @@ services:
openstack-origin: *openstack-origin
to:
- '21'
channel: latest/edge
channel: 2024.1/edge
rabbitmq-server:
charm: ch:rabbitmq-server
@@ -211,7 +211,7 @@ services:
openstack-origin: *openstack-origin
to:
- '23'
channel: latest/edge
channel: 2024.1/edge
nrpe:
charm: ch:nrpe

16
src/tests/tests.yaml
View File

@@ -1,16 +1,13 @@
charm_name: manila-ganesha
gate_bundles:
- jammy-antelope
- jammy-antelope
- jammy-bobcat
- jammy-caracal
dev_bundles:
- jammy-bobcat
- lunar-antelope
- mantic-bobcat
- noble-caracal
smoke_bundles:
- jammy-yoga
- jammy-caracal
target_deploy_status: {}
tests:
@@ -26,5 +23,4 @@ configure:
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

@@ -59,12 +59,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]
@@ -77,7 +81,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}