Add charmcraft 3 support

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

- Update config to default to caracal.
- Update osci.yaml to use the charmcraft 3.x/beta
- Add noble/oracular to charmhelpers
- Drop non-noble tests

Change-Id: Iacb73d68810b10c7fa79971bf0165f7ea5c7412a

charmcraft.yaml

@@ -4,30 +4,18 @@ parts:
   charm:
     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
 
-bases:
-  - build-on:
-      - name: ubuntu
-        channel: "22.04"
-        architectures:
-          - amd64
-    run-on:
-      - name: ubuntu
-        channel: "22.04"
-        architectures: [amd64, s390x, ppc64el, arm64]
+base: ubuntu@24.04
+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

config.yaml

@@ -54,7 +54,7 @@ options:
       Setting this to True will enable port forwarding (Rocky and later).
   openstack-origin:
     type: string
-    default: bobcat
+    default: caracal
     description: |
       Repository from which to install. May be one of the following:
       distro (default), ppa:somecustom/ppa, a deb url sources entry,

hooks/charmhelpers/core/host_factory/ubuntu.py

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

osci.yaml

@@ -6,4 +6,4 @@
       needs_charm_build: true
       charm_build_name: neutron-api
       build_type: charmcraft
-      charmcraft_channel: 2.x/stable
+      charmcraft_channel: 3.x/beta

tests/bundles/jammy-antelope.yaml

@@ -1,45 +0,0 @@
-variables:
-  openstack-origin: &openstack-origin cloud:jammy-antelope
-
-series: &series jammy
-
-applications:
-  keystone-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  neutron-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  mysql-innodb-cluster:
-    charm: ch:mysql-innodb-cluster
-    num_units: 3
-    options:
-      source: *openstack-origin
-    channel: latest/edge
-  rabbitmq-server:
-    charm: ch:rabbitmq-server
-    num_units: 1
-    channel: latest/edge
-  neutron-api:
-    charm: ../../neutron-api.charm
-    num_units: 1
-    options:
-      manage-neutron-plugin-legacy-mode: True
-      flat-network-providers: physnet1
-      neutron-security-groups: true
-      openstack-origin: *openstack-origin
-  keystone:
-    charm: ch:keystone
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    channel: 2024.1/edge
-relations:
-  - - neutron-api:amqp
-    - rabbitmq-server:amqp
-  - - neutron-api:identity-service
-    - keystone:identity-service
-  - ["keystone:shared-db", "keystone-mysql-router:shared-db"]
-  - ["neutron-api:shared-db", "neutron-mysql-router:shared-db"]
-  - ["keystone-mysql-router:db-router", "mysql-innodb-cluster:db-router"]
-  - ["neutron-mysql-router:db-router", "mysql-innodb-cluster:db-router"]

tests/bundles/jammy-bobcat.yaml

@@ -1,45 +0,0 @@
-variables:
-  openstack-origin: &openstack-origin cloud:jammy-bobcat
-
-series: &series jammy
-
-applications:
-  keystone-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  neutron-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  mysql-innodb-cluster:
-    charm: ch:mysql-innodb-cluster
-    num_units: 3
-    options:
-      source: *openstack-origin
-    channel: latest/edge
-  rabbitmq-server:
-    charm: ch:rabbitmq-server
-    num_units: 1
-    channel: latest/edge
-  neutron-api:
-    charm: ../../neutron-api.charm
-    num_units: 1
-    options:
-      manage-neutron-plugin-legacy-mode: True
-      flat-network-providers: physnet1
-      neutron-security-groups: true
-      openstack-origin: *openstack-origin
-  keystone:
-    charm: ch:keystone
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    channel: 2024.1/edge
-relations:
-  - - neutron-api:amqp
-    - rabbitmq-server:amqp
-  - - neutron-api:identity-service
-    - keystone:identity-service
-  - ["keystone:shared-db", "keystone-mysql-router:shared-db"]
-  - ["neutron-api:shared-db", "neutron-mysql-router:shared-db"]
-  - ["keystone-mysql-router:db-router", "mysql-innodb-cluster:db-router"]
-  - ["neutron-mysql-router:db-router", "mysql-innodb-cluster:db-router"]

tests/bundles/jammy-caracal.yaml

@@ -1,45 +0,0 @@
-variables:
-  openstack-origin: &openstack-origin cloud:jammy-caracal
-
-series: &series jammy
-
-applications:
-  keystone-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  neutron-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  mysql-innodb-cluster:
-    charm: ch:mysql-innodb-cluster
-    num_units: 3
-    options:
-      source: *openstack-origin
-    channel: latest/edge
-  rabbitmq-server:
-    charm: ch:rabbitmq-server
-    num_units: 1
-    channel: latest/edge
-  neutron-api:
-    charm: ../../neutron-api.charm
-    num_units: 1
-    options:
-      manage-neutron-plugin-legacy-mode: True
-      flat-network-providers: physnet1
-      neutron-security-groups: true
-      openstack-origin: *openstack-origin
-  keystone:
-    charm: ch:keystone
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    channel: 2024.1/edge
-relations:
-  - - neutron-api:amqp
-    - rabbitmq-server:amqp
-  - - neutron-api:identity-service
-    - keystone:identity-service
-  - ["keystone:shared-db", "keystone-mysql-router:shared-db"]
-  - ["neutron-api:shared-db", "neutron-mysql-router:shared-db"]
-  - ["keystone-mysql-router:db-router", "mysql-innodb-cluster:db-router"]
-  - ["neutron-mysql-router:db-router", "mysql-innodb-cluster:db-router"]

tests/bundles/noble-caracal.yaml

@@ -33,7 +33,7 @@ applications:
     num_units: 1
     options:
       openstack-origin: *openstack-origin
-    channel: 2024.1/edge
+    channel: latest/edge
 relations:
   - - neutron-api:amqp
     - rabbitmq-server:amqp

tests/tests.yaml

@@ -1,9 +1,7 @@
 charm_name: neutron-api
 
 gate_bundles:
-  - jammy-antelope
-  - jammy-bobcat
-  - jammy-caracal
+  - noble-caracal
 smoke_bundles:
   - jammy-caracal
 dev_bundles:
@@ -24,5 +22,3 @@ tests_options:
     application: neutron-api
   policyd:
     service: neutron
-  force_deploy:
-    - noble-caracal