openstack/charm-ceph-nfs
Code Issues Proposed changes

Add support for interim Ubuntu releases

Browse Source 
- update bundles to include UCA pocket tests
- update test configuration
- update metadata to include kinetic and lunar
- update snapcraft to allow run-on for kinetic and lunar

Change-Id: I8e8fdcaec9b51aeb16ffc255fdc94ad991980504
This commit is contained in:
Chris MacNaughton 2023-03-17 10:21:11 -04:00
parent 85da27123f
commit 3c97a8ac6c
6 changed files with 125 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
charmcraft.yaml
View File

@ -32,4 +32,10 @@ bases:
architectures: [amd64, s390x, ppc64el, arm64]
- name: ubuntu
channel: "22.04"
architectures: [amd64, s390x, ppc64el, arm64]
architectures: [amd64, s390x, ppc64el, arm64]
- name: ubuntu
channel: "22.10"
architectures: [amd64, s390x, ppc64el, arm64]
- name: ubuntu
channel: "23.04"
architectures: [amd64, s390x, ppc64el, arm64]

2
metadata.yaml
View File

@ -10,6 +10,8 @@ tags:
series:
- focal
- jammy
- kinetic
- lunar
subordinate: false
min-juju-version: 2.7.6
extra-bindings:

24
osci.yaml
View File

@ -7,6 +7,8 @@
- focal-pacific
- focal-quincy
- jammy-quincy
- kinetic-quincy
- lunar-quincy
vars:
needs_charm_build: true
charm_build_name: ceph-nfs
@ -20,7 +22,7 @@
- tox-py38
- tox-py39
vars:
tox_extra_args: focal-pacific
tox_extra_args: -- focal-pacific
- job:
name: focal-quincy
parent: func-target
@ -30,11 +32,27 @@
- tox-py38
- tox-py39
vars:
tox_extra_args: focal-quincy
tox_extra_args: -- focal-quincy
- job:
name: jammy-quincy
parent: func-target
dependencies:
- focal-quincy
vars:
tox_extra_args: jammy-quincy
tox_extra_args: -- jammy-quincy
- job:
name: kinetic-quincy
parent: func-target
dependencies:
- focal-quincy
vars:
tox_extra_args: -- kinetic-quincy
- job:
name: lunar-quincy
parent: func-target
voting: false
dependencies:
- focal-quincy
vars:
tox_extra_args: -- lunar-quincy

2
requirements.txt
View File

@ -1,6 +1,6 @@
# requirements
ops <= 1.6.0
git+https://github.com/juju/charm-helpers.git#egg=charmhelpers
git+https://github.com/canonical/operator.git#egg=ops
git+https://opendev.org/openstack/charm-ops-interface-ceph-client#egg=interface_ceph_client
git+https://github.com/ChrisMacNaughton/charm-ops-openstack.git@feature/charm-instance-to-relation-adapter#egg=ops_openstack
git+https://opendev.org/openstack/charm-interface-hacluster#egg=interface_hacluster

47
tests/bundles/kinetic-quincy.yaml Normal file
View File

@ -0,0 +1,47 @@
local_overlay_enabled: False
series: jammy
applications:
ubuntu:
charm: cs:ubuntu
num_units: 2
ceph-nfs:
charm: ../../ceph-nfs.charm
num_units: 2
options:
source: distro
ceph-osd:
charm: ch:ceph-osd
channel: quincy/edge
num_units: 3
storage:
osd-devices: '2,10G'
options:
source: distro
ceph-mon:
charm: ch:ceph-mon
channel: quincy/edge
num_units: 3
options:
monitor-count: '3'
expected-osd-count: 6
source: distro
ceph-fs:
charm: ch:ceph-fs
channel: quincy/edge
num_units: 2
options:
source: distro
hacluster:
charm: ch:hacluster
channel: 2.4/edge
options:
cluster_count: 2
relations:
- - 'ceph-mon:client'
- 'ceph-nfs:ceph-client'
- - 'ceph-osd:mon'
- 'ceph-mon:osd'
- - 'ceph-fs'
- 'ceph-mon'
- - 'ceph-nfs:ha'
- 'hacluster:ha'

47
tests/bundles/lunar-quincy.yaml Normal file
View File

@ -0,0 +1,47 @@
local_overlay_enabled: False
series: jammy
applications:
ubuntu:
charm: cs:ubuntu
num_units: 2
ceph-nfs:
charm: ../../ceph-nfs.charm
num_units: 2
options:
source: distro
ceph-osd:
charm: ch:ceph-osd
channel: quincy/edge
num_units: 3
storage:
osd-devices: '2,10G'
options:
source: distro
ceph-mon:
charm: ch:ceph-mon
channel: quincy/edge
num_units: 3
options:
monitor-count: '3'
expected-osd-count: 6
source: distro
ceph-fs:
charm: ch:ceph-fs
channel: quincy/edge
num_units: 2
options:
source: distro
hacluster:
charm: ch:hacluster
channel: 2.4/edge
options:
cluster_count: 2
relations:
- - 'ceph-mon:client'
- 'ceph-nfs:ceph-client'
- - 'ceph-osd:mon'
- 'ceph-mon:osd'
- - 'ceph-fs'
- 'ceph-mon'
- - 'ceph-nfs:ha'
- 'hacluster:ha'