openstack/charm-ceph-nfs
Code Issues Proposed changes

Add charmcraft 3 support

Browse Source 
Update the charmcraft.yaml file to use base and platforms, only
allowing noble support.

- Update osci.yaml to use the charmcraft 3.x/beta
- Drop non-noble tests

Change-Id: Ic3b8525f6df049d68d959151fd5345cb55db6607
This commit is contained in:
Peter Sabaini 2024-07-05 12:44:53 +02:00
parent f47c9195bb
commit 52fb257d66
8 changed files with 24 additions and 211 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
charmcraft.yaml
View File

@ -4,11 +4,6 @@ parts:
charm:
after:
- update-certificates
charm-python-packages:
# NOTE(lourot): see
# * https://github.com/canonical/charmcraft/issues/551
# * https://github.com/canonical/charmcraft/issues/632
- setuptools < 58
build-packages:
- git
@ -20,16 +15,18 @@ parts:
apt install -y ca-certificates
update-ca-certificates
bases:
- build-on:
- name: ubuntu
channel: "20.04"
architectures:
- amd64
run-on:
- name: ubuntu
channel: "20.04"
architectures: [amd64, s390x, ppc64el, arm64]
- name: ubuntu
channel: "22.04"
architectures: [amd64, s390x, ppc64el, arm64]
base: ubuntu@24.04
build-base: ubuntu@24.04
platforms:
amd64:
build-on: amd64
build-for: amd64
arm64:
build-on: arm64
build-for: arm64
s390x:
build-on: s390x
build-for: s390x
ppc64el:
build-on: ppc64el
build-for: ppc64el

3
metadata.yaml
View File

@ -9,8 +9,7 @@ tags:
- storage
- misc
series:
- focal
- jammy
- noble
subordinate: false
min-juju-version: 2.7.6
extra-bindings:

40
osci.yaml
View File

@ -1,45 +1,9 @@
- project:
templates:
- charm-unit-jobs-py38
- charm-unit-jobs-py310
check:
jobs:
- focal-quincy
- jammy-quincy
- jammy-reef
- jammy-squid
- charm-functional-jobs
vars:
needs_charm_build: true
charm_build_name: ceph-nfs
build_type: charmcraft
charmcraft_channel: 2.x/stable
- job:
name: focal-quincy
parent: func-target
dependencies:
- charm-build
- osci-lint
- tox-py38
vars:
tox_extra_args: -- focal-quincy
- job:
name: jammy-quincy
parent: func-target
dependencies:
- focal-quincy
vars:
tox_extra_args: -- jammy-quincy
- job:
name: jammy-reef
parent: func-target
dependencies:
- focal-quincy
vars:
tox_extra_args: -- jammy-reef
- job:
name: jammy-squid
parent: func-target
dependencies:
- focal-quincy
vars:
tox_extra_args: -- jammy-squid
charmcraft_channel: 3.x/beta

47
tests/bundles/focal-quincy.yaml
View File

@ -1,47 +0,0 @@
local_overlay_enabled: False
series: focal
applications:
ubuntu:
charm: cs:ubuntu
num_units: 2
ceph-nfs:
charm: ../../ceph-nfs.charm
num_units: 2
options:
source: proposed
ceph-osd:
charm: ch:ceph-osd
channel: quincy/edge
num_units: 3
storage:
osd-devices: '2,10G'
options:
source: cloud:focal-yoga
ceph-mon:
charm: ch:ceph-mon
channel: quincy/edge
num_units: 3
options:
monitor-count: '3'
expected-osd-count: 6
source: cloud:focal-yoga
ceph-fs:
charm: ch:ceph-fs
channel: quincy/edge
num_units: 2
options:
source: cloud:focal-yoga
hacluster:
charm: ch:hacluster
channel: 2.0.3/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/jammy-quincy.yaml
View File

@ -1,47 +0,0 @@
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'

50
tests/bundles/jammy-reef.yaml
View File

@ -1,50 +0,0 @@
options:
source: &source cloud:jammy-bobcat
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: *source
ceph-osd:
charm: ch:ceph-osd
channel: reef/edge
num_units: 3
storage:
osd-devices: '2,10G'
options:
source: *source
ceph-mon:
charm: ch:ceph-mon
channel: reef/edge
num_units: 3
options:
monitor-count: '3'
expected-osd-count: 6
source: *source
ceph-fs:
charm: ch:ceph-fs
channel: reef/edge
num_units: 2
options:
source: *source
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'

7
tests/bundles/jammy-squid.yaml → tests/bundles/noble-caracal.yaml
View File

@ -1,12 +1,13 @@
options:
source: &source cloud:jammy-caracal
source: &source distro
local_overlay_enabled: False
series: jammy
series: noble
applications:
ubuntu:
charm: cs:ubuntu
charm: ch:ubuntu
num_units: 2
series: jammy
ceph-nfs:
charm: ../../ceph-nfs.charm
num_units: 2

8
tests/tests.yaml
View File

@ -1,12 +1,8 @@
charm_name: ceph-nfs
gate_bundles:
- focal-quincy
- focal-pacific
- jammy-quincy
- jammy-reef
- jammy-squid
- noble-caracal
smoke_bundles:
- focal-pacific
- noble-caracal
configure: []
tests:
- tests.nfs_ganesha.NfsGaneshaTest