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: I8e6b4040d84a7022e22305a629a854a22232d65d

charmcraft.yaml

@@ -5,34 +5,32 @@ parts:
     plugin: dump
     source: .
     prime:
-      - actions/*
-      - charmhelpers/*
-      - files/*
-      - hooks/*
-      - lib/*
-      - templates/*
-      - actions.yaml
-      - config.yaml
-      - copyright
-      - icon.svg
-      - LICENSE
-      - Makefile
-      - metadata.yaml
-      - README.md
+    - actions/*
+    - charmhelpers/*
+    - files/*
+    - hooks/*
+    - lib/*
+    - templates/*
+    - actions.yaml
+    - config.yaml
+    - copyright
+    - 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.10"
-        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

charmhelpers/core/host_factory/ubuntu.py

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

osci.yaml

@@ -1,10 +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: hacluster
       build_type: charmcraft
-      charmcraft_channel: 2.x/stable
+      charmcraft_channel: 3.x/beta

tests/bundles/focal-yoga.yaml

@@ -1,57 +0,0 @@
-variables:
-  openstack-origin: &openstack-origin cloud:focal-yoga
-
-series: focal
-
-machines:
-  '0':
-    constraints: mem=3072M
-  '1':
-    constraints: mem=3072M
-  '2':
-    constraints: mem=3072M
-  '3':
-  '4':
-  '5':
-
-applications:
-
-  keystone-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-
-  mysql-innodb-cluster:
-    charm: ch:mysql-innodb-cluster
-    num_units: 3
-    options:
-      source: *openstack-origin
-    to:
-      - '0'
-      - '1'
-      - '2'
-    channel: latest/edge
-
-  keystone:
-    charm: ch:keystone
-    num_units: 3
-    options:
-      token-expiration: 60
-      openstack-origin: *openstack-origin
-    to:
-      - '3'
-      - '4'
-      - '5'
-    channel: yoga/edge
-
-  keystone-hacluster:
-    charm: ../../hacluster.charm
-    subordinate-to:
-      - keystone
-
-relations:
-  - - 'keystone:shared-db'
-    - 'keystone-mysql-router:shared-db'
-  - - 'keystone-hacluster:ha'
-    - 'keystone:ha'
-  - - "keystone-mysql-router:db-router"
-    - "mysql-innodb-cluster:db-router"

tests/bundles/jammy-bobcat.yaml

@@ -1,57 +0,0 @@
-variables:
-  openstack-origin: &openstack-origin cloud:jammy-bobcat
-
-series: jammy
-
-machines:
-  '0':
-    constraints: mem=3072M
-  '1':
-    constraints: mem=3072M
-  '2':
-    constraints: mem=3072M
-  '3':
-  '4':
-  '5':
-
-applications:
-
-  keystone-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-
-  mysql-innodb-cluster:
-    charm: ch:mysql-innodb-cluster
-    num_units: 3
-    options:
-      source: *openstack-origin
-    to:
-      - '0'
-      - '1'
-      - '2'
-    channel: latest/edge
-
-  keystone:
-    charm: ch:keystone
-    num_units: 3
-    options:
-      token-expiration: 60
-      openstack-origin: *openstack-origin
-    to:
-      - '3'
-      - '4'
-      - '5'
-    channel: yoga/edge
-
-  keystone-hacluster:
-    charm: ../../hacluster.charm
-    subordinate-to:
-      - keystone
-
-relations:
-  - - 'keystone:shared-db'
-    - 'keystone-mysql-router:shared-db'
-  - - 'keystone-hacluster:ha'
-    - 'keystone:ha'
-  - - "keystone-mysql-router:db-router"
-    - "mysql-innodb-cluster:db-router"

tests/bundles/noble-caracal.yaml

@@ -1,7 +1,7 @@
 variables:
   openstack-origin: &openstack-origin distro
 
-series: jammy
+series: noble
 
 machines:
   '0':
@@ -41,7 +41,7 @@ applications:
       - '3'
       - '4'
       - '5'
-    channel: yoga/edge
+    channel: latest/edge
 
   keystone-hacluster:
     charm: ../../hacluster.charm

tests/tests.yaml

@@ -1,15 +1,13 @@
 charm_name: hacluster
 
 smoke_bundles:
-  - focal-yoga
+  - noble-caracal
 
 gate_bundles:
-  - focal-yoga
+  - noble-caracal
 
 dev_bundles:
-  - jammy-yoga
-  - jammy-bobcat
-  - mantic-bobcat
+  - noble-caracal
 
 configure:
   - zaza.openstack.charm_tests.keystone.setup.add_demo_user
@@ -22,6 +20,3 @@ tests_options:
   hacluster:
     principle-app-name: keystone
     hacluster-charm-name: hacluster
-  force_deploy:
-    - jammy-yoga
-    - mantic-bobcat