Add charmcraft 3 support

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

charmcraft.yaml

@@ -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:
+base: ubuntu@24.04
-  - build-on:
+build-base: ubuntu@24.04
-      - name: ubuntu
+platforms:
-        channel: "20.04"
+  amd64:
-        architectures:
+    build-on: amd64
-          - amd64
+    build-for: amd64
-    run-on:
+  arm64:
-      - name: ubuntu
+    build-on: arm64
-        channel: "20.04"
+    build-for: arm64
-        architectures: [amd64, s390x, ppc64el, arm64]
+  s390x:
-      - name: ubuntu
+    build-on: s390x
-        channel: "22.04"
+    build-for: s390x
-        architectures: [amd64, s390x, ppc64el, arm64]
+  ppc64el:
+    build-on: ppc64el
+    build-for: ppc64el

metadata.yaml

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

osci.yaml

@@ -1,45 +1,9 @@
 - project:
     templates:
-      - charm-unit-jobs-py38
       - charm-unit-jobs-py310
-    check:
+      - charm-functional-jobs
-      jobs:
-      - focal-quincy
-      - jammy-quincy
-      - jammy-reef
-      - jammy-squid
     vars:
       needs_charm_build: true
       charm_build_name: ceph-nfs
       build_type: charmcraft
-      charmcraft_channel: 2.x/stable
+      charmcraft_channel: 3.x/beta
-- 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

tests/bundles/focal-quincy.yaml

@@ -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'

tests/bundles/jammy-quincy.yaml

@@ -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'

tests/bundles/jammy-reef.yaml

@@ -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'

tests/bundles/noble-caracal.yaml

@@ -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

tests/tests.yaml

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