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
- Add noble/oracular to charmhelpers
- Drop non-noble tests

Change-Id: If23d82a0c31ccdc3f383d83c29761cddcfdafbd0

charmcraft.yaml

@@ -5,38 +5,33 @@ parts:
     plugin: dump
     source: .
     prime:
-      - actions/*
-      - charmhelpers/*
-      - files/*
-      - hooks/*
-      - lib/*
-      - templates/*
-      - actions.yaml
-      - config.yaml
-      - copyright
-      - hardening.yaml
-      - icon.svg
-      - LICENSE
-      - Makefile
-      - metadata.yaml
-      - README.md
+    - actions/*
+    - charmhelpers/*
+    - files/*
+    - hooks/*
+    - lib/*
+    - templates/*
+    - actions.yaml
+    - config.yaml
+    - copyright
+    - hardening.yaml
+    - icon.svg
+    - LICENSE
+    - Makefile
+    - metadata.yaml
+    - README.md
 
-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]
-      - name: ubuntu
-        channel: "23.04"
-        architectures: [amd64, s390x, ppc64el, arm64]
-      - name: ubuntu
-        channel: "23.10"
-        architectures: [amd64, s390x, ppc64el, arm64]
+base: [email protected]
+platforms:
+  amd64:
+    build-on: amd64
+    build-for: amd64
+  arm64:
+    build-on: arm64
+    build-for: arm64
+  ppc64el:
+    build-on: ppc64el
+    build-for: ppc64el
+  s390x:
+    build-on: s390x
+    build-for: s390x

charmhelpers/core/host_factory/ubuntu.py

@@ -33,6 +33,8 @@
     'kinetic',
     'lunar',
     'mantic',
+    'noble',
+    'oracular',
 )
 
 

osci.yaml

@@ -1,9 +1,9 @@
 - project:
     templates:
-      - charm-unit-jobs-py38
       - charm-unit-jobs-py310
-      - charm-yoga-functional-jobs
+      - charm-functional-jobs
     vars:
       needs_charm_build: true
       charm_build_name: rabbitmq-server
       build_type: charmcraft
+      charmcraft_channel: 3.x/beta

tests/bundles/jammy-yoga.yaml → tests/bundles/noble-caracal.yaml

@@ -1,7 +1,7 @@
 variables:
   openstack-origin: &openstack-origin distro
 
-series: jammy
+series: noble
 
 comment:
 - 'machines section to decide order of deployment. database sooner = faster'
@@ -59,7 +59,7 @@ applications:
       openstack-origin: *openstack-origin
     to:
       - '6'
-    channel: yoga/edge
+    channel: latest/edge
 
   keystone:
     charm: ch:keystone
@@ -69,7 +69,7 @@ applications:
       admin-password: openstack
     to:
       - '7'
-    channel: yoga/edge
+    channel: latest/edge
 
 relations:
 

tests/tests.yaml

@@ -1,20 +1,16 @@
 charm_name: rabbitmq-server
 
 smoke_bundles:
-  - focal-yoga
+  - noble-caracal
 
 gate_bundles:
-  - focal-yoga
+  - noble-caracal
 
 dev_bundles:
-  - jammy-yoga
+  - noble-caracal
 
 tests:
   - zaza.openstack.charm_tests.rabbitmq_server.tests.RabbitMQDeferredRestartTest
   - zaza.openstack.charm_tests.rabbitmq_server.tests.RmqTests
   - zaza.openstack.charm_tests.rabbitmq_server.tests.RmqRotateServiceUserPasswordTests
 
-tests_options:
-  force_deploy:
-    # nrpe charm doesn't support hirsute->jammy and needs to be force installed
-    - jammy-yoga