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/*
+    - actions/*
-      - charmhelpers/*
+    - charmhelpers/*
-      - files/*
+    - files/*
-      - hooks/*
+    - hooks/*
-      - lib/*
+    - lib/*
-      - templates/*
+    - templates/*
-      - actions.yaml
+    - actions.yaml
-      - config.yaml
+    - config.yaml
-      - copyright
+    - copyright
-      - hardening.yaml
+    - hardening.yaml
-      - icon.svg
+    - icon.svg
-      - LICENSE
+    - LICENSE
-      - Makefile
+    - Makefile
-      - metadata.yaml
+    - metadata.yaml
-      - README.md
+    - README.md
 
-bases:
+base: ubuntu@24.04
-  - build-on:
+platforms:
-      - name: ubuntu
+  amd64:
-        channel: "20.04"
+    build-on: amd64
-        architectures:
+    build-for: amd64
-          - amd64
+  arm64:
-    run-on:
+    build-on: arm64
-      - name: ubuntu
+    build-for: arm64
-        channel: "20.04"
+  ppc64el:
-        architectures: [amd64, s390x, ppc64el, arm64]
+    build-on: ppc64el
-      - name: ubuntu
+    build-for: ppc64el
-        channel: "22.04"
+  s390x:
-        architectures: [amd64, s390x, ppc64el, arm64]
+    build-on: s390x
-      - name: ubuntu
+    build-for: s390x
-        channel: "23.04"
-        architectures: [amd64, s390x, ppc64el, arm64]
-      - name: ubuntu
-        channel: "23.10"
-        architectures: [amd64, s390x, ppc64el, arm64]

charmhelpers/core/host_factory/ubuntu.py

@@ -33,6 +33,8 @@ UBUNTU_RELEASES = (
     '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/focal-yoga.yaml

@@ -1,104 +0,0 @@
-variables:
-  openstack-origin: &openstack-origin cloud:focal-yoga
-
-series: focal
-
-comment:
-- 'machines section to decide order of deployment. database sooner = faster'
-machines:
-  '0':
-    constraints: mem=3072M
-  '1':
-    constraints: mem=3072M
-  '2':
-    constraints: mem=3072M
-  '3':
-  '4':
-  '5':
-  '6':
-  '7':
-  '8':
-    series: bionic  # nagios not supported on focal yet
-
-
-applications:
-
-  keystone-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  cinder-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-
-  mysql-innodb-cluster:
-    charm: ch:mysql-innodb-cluster
-    num_units: 3
-    to:
-      - '0'
-      - '1'
-      - '2'
-    channel: latest/edge
-
-  rabbitmq-server:
-    charm: ../../rabbitmq-server.charm
-    num_units: 3
-    constraints:
-      cpu-cores=2
-    options:
-      min-cluster-size: 3
-      max-cluster-tries: 6
-      ssl: "off"
-      management_plugin: "False"
-      stats_cron_schedule: "*/1 * * * *"
-    to:
-      - '3'
-      - '4'
-      - '5'
-
-  cinder:
-    charm: ch:cinder
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '6'
-    channel: yoga/edge
-
-  keystone:
-    charm: ch:keystone
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      admin-password: openstack
-    to:
-      - '7'
-    channel: yoga/edge
-
-  nagios:
-    charm: ch:nagios
-    series: bionic  # not supported on focal yet
-    num_units: 1
-    to:
-      - '8'
-
-  nrpe:
-    charm: ch:nrpe
-
-relations:
-
-  - - 'cinder:amqp'
-    - 'rabbitmq-server:amqp'
-  - - 'cinder:shared-db'
-    - 'cinder-mysql-router:shared-db'
-  - - 'cinder-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-  - - 'cinder:identity-service'
-    - 'keystone:identity-service'
-  - - 'keystone:shared-db'
-    - 'keystone-mysql-router:shared-db'
-  - - 'keystone-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-  - - 'nrpe:nrpe-external-master'
-    - 'rabbitmq-server:nrpe-external-master'
-  - - 'nrpe:monitors'
-    - 'nagios:monitors'

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