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

charmcraft.yaml

@@ -21,13 +21,17 @@ parts:
     - metadata.yaml
     - README.md
 
-bases:
+base: ubuntu@24.04
-  - build-on:
+platforms:
-      - name: ubuntu
+  amd64:
-        channel: "22.04"
+    build-on: amd64
-        architectures:
+    build-for: amd64
-          - amd64
+  arm64:
-    run-on:
+    build-on: arm64
-      - name: ubuntu
+    build-for: arm64
-        channel: "22.04"
+  ppc64el:
-        architectures: [amd64, s390x, ppc64el, arm64]
+    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',
 )
 
 

config.yaml

@@ -19,7 +19,7 @@ options:
       Enable Keystone auditing middleware for logging API calls.
   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,

osci.yaml

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

tests/bundles/jammy-antelope.yaml

@@ -1,189 +0,0 @@
-variables:
-  openstack-origin: &openstack-origin cloud:jammy-antelope
-
-series: jammy
-
-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':
-  '9':
-  '10':
-  '11':
-  '12':
-  '13':
-  '14':
-  '15':
-  '16':
-
-applications:
-
-  keystone-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  glance-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
-
-  ceph-osd:
-    charm: ch:ceph-osd
-    num_units: 6
-    storage:
-      osd-devices: '10G'
-    options:
-      source: *openstack-origin
-    to:
-      - '3'
-      - '4'
-      - '5'
-      - '6'
-      - '7'
-      - '8'
-    channel: reef/edge
-
-  ceph-radosgw:
-    charm: ch:ceph-radosgw
-    num_units: 1
-    options:
-      source: *openstack-origin
-    to:
-      - '15'
-    channel: reef/edge
-
-  ceph-mon:
-    charm: ch:ceph-mon
-    num_units: 3
-    options:
-      source: *openstack-origin
-      monitor-count: '3'
-    to:
-      - '9'
-      - '10'
-      - '11'
-    channel: reef/edge
-
-  rabbitmq-server:
-    charm: ch:rabbitmq-server
-    num_units: 1
-    to:
-      - '12'
-    channel: latest/edge
-
-  keystone:
-    expose: True
-    charm: ch:keystone
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '13'
-    channel: 2024.1/edge
-
-  glance:
-    expose: True
-    charm: ../../glance.charm
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      pool-type: erasure-coded
-      ec-profile-k: 4
-      ec-profile-m: 2
-      ec-profile-plugin: jerasure
-    to:
-      - '14'
-
-  cinder:
-    expose: True
-    charm: ch:cinder
-    num_units: 1
-    storage:
-      block-devices: '10G'
-    options:
-      openstack-origin: *openstack-origin
-      glance-api-version: 2
-      block-device: None
-    to:
-      - '16'
-    channel: 2024.1/edge
-
-  cinder-lvm:
-    charm: ch:cinder-lvm
-    options:
-      block-device: '/tmp/vol1|4G'
-      alias: zaza-lvm
-      overwrite: "true"
-      ephemeral-unmount: /mnt
-      allocation-type: auto
-      config-flags: target_helper=lioadm
-    channel: 2024.1/edge
-
-relations:
-  - - 'keystone:shared-db'
-    - 'keystone-mysql-router:shared-db'
-  - - 'keystone-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'glance:shared-db'
-    - 'glance-mysql-router:shared-db'
-  - - 'glance-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'glance:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'glance:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'glance:ceph'
-    - 'ceph-mon:client'
-
-  - - 'ceph-osd:mon'
-    - 'ceph-mon:osd'
-
-  - - 'ceph-radosgw:mon'
-    - 'ceph-mon:radosgw'
-  - - 'ceph-radosgw:identity-service'
-    - 'keystone:identity-service'
-  - - 'ceph-radosgw:object-store'
-    - 'glance:object-store'
-
-  - - 'cinder:shared-db'
-    - 'cinder-mysql-router:shared-db'
-  - - 'cinder-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'cinder:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'cinder:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'cinder:image-service'
-    - 'glance:image-service'
-  - - 'cinder:cinder-volume-service'
-    - 'glance:cinder-volume-service'
-  - - 'cinder-lvm:storage-backend'
-    - 'cinder:storage-backend'

tests/bundles/jammy-bobcat.yaml

@@ -1,189 +0,0 @@
-variables:
-  openstack-origin: &openstack-origin cloud:jammy-bobcat
-
-series: jammy
-
-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':
-  '9':
-  '10':
-  '11':
-  '12':
-  '13':
-  '14':
-  '15':
-  '16':
-
-applications:
-
-  keystone-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  glance-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
-
-  ceph-osd:
-    charm: ch:ceph-osd
-    num_units: 6
-    storage:
-      osd-devices: '10G'
-    options:
-      source: *openstack-origin
-    to:
-      - '3'
-      - '4'
-      - '5'
-      - '6'
-      - '7'
-      - '8'
-    channel: reef/edge
-
-  ceph-radosgw:
-    charm: ch:ceph-radosgw
-    num_units: 1
-    options:
-      source: *openstack-origin
-    to:
-      - '15'
-    channel: reef/edge
-
-  ceph-mon:
-    charm: ch:ceph-mon
-    num_units: 3
-    options:
-      source: *openstack-origin
-      monitor-count: '3'
-    to:
-      - '9'
-      - '10'
-      - '11'
-    channel: reef/edge
-
-  rabbitmq-server:
-    charm: ch:rabbitmq-server
-    num_units: 1
-    to:
-      - '12'
-    channel: latest/edge
-
-  keystone:
-    expose: True
-    charm: ch:keystone
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '13'
-    channel: 2024.1/edge
-
-  glance:
-    expose: True
-    charm: ../../glance.charm
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      pool-type: erasure-coded
-      ec-profile-k: 4
-      ec-profile-m: 2
-      ec-profile-plugin: jerasure
-    to:
-      - '14'
-
-  cinder:
-    expose: True
-    charm: ch:cinder
-    num_units: 1
-    storage:
-      block-devices: '10G'
-    options:
-      openstack-origin: *openstack-origin
-      glance-api-version: 2
-      block-device: None
-    to:
-      - '16'
-    channel: 2024.1/edge
-
-  cinder-lvm:
-    charm: ch:cinder-lvm
-    options:
-      block-device: '/tmp/vol1|4G'
-      alias: zaza-lvm
-      overwrite: "true"
-      ephemeral-unmount: /mnt
-      allocation-type: auto
-      config-flags: target_helper=lioadm
-    channel: 2024.1/edge
-
-relations:
-  - - 'keystone:shared-db'
-    - 'keystone-mysql-router:shared-db'
-  - - 'keystone-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'glance:shared-db'
-    - 'glance-mysql-router:shared-db'
-  - - 'glance-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'glance:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'glance:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'glance:ceph'
-    - 'ceph-mon:client'
-
-  - - 'ceph-osd:mon'
-    - 'ceph-mon:osd'
-
-  - - 'ceph-radosgw:mon'
-    - 'ceph-mon:radosgw'
-  - - 'ceph-radosgw:identity-service'
-    - 'keystone:identity-service'
-  - - 'ceph-radosgw:object-store'
-    - 'glance:object-store'
-
-  - - 'cinder:shared-db'
-    - 'cinder-mysql-router:shared-db'
-  - - 'cinder-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'cinder:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'cinder:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'cinder:image-service'
-    - 'glance:image-service'
-  - - 'cinder:cinder-volume-service'
-    - 'glance:cinder-volume-service'
-  - - 'cinder-lvm:storage-backend'
-    - 'cinder:storage-backend'

tests/bundles/jammy-caracal.yaml

@@ -1,189 +0,0 @@
-variables:
-  openstack-origin: &openstack-origin cloud:jammy-caracal
-
-series: jammy
-
-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':
-  '9':
-  '10':
-  '11':
-  '12':
-  '13':
-  '14':
-  '15':
-  '16':
-
-applications:
-
-  keystone-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  glance-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
-
-  ceph-osd:
-    charm: ch:ceph-osd
-    num_units: 6
-    storage:
-      osd-devices: '10G'
-    options:
-      source: *openstack-origin
-    to:
-      - '3'
-      - '4'
-      - '5'
-      - '6'
-      - '7'
-      - '8'
-    channel: latest/edge
-
-  ceph-radosgw:
-    charm: ch:ceph-radosgw
-    num_units: 1
-    options:
-      source: *openstack-origin
-    to:
-      - '15'
-    channel: latest/edge
-
-  ceph-mon:
-    charm: ch:ceph-mon
-    num_units: 3
-    options:
-      source: *openstack-origin
-      monitor-count: '3'
-    to:
-      - '9'
-      - '10'
-      - '11'
-    channel: latest/edge
-
-  rabbitmq-server:
-    charm: ch:rabbitmq-server
-    num_units: 1
-    to:
-      - '12'
-    channel: latest/edge
-
-  keystone:
-    expose: True
-    charm: ch:keystone
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '13'
-    channel: 2024.1/edge
-
-  glance:
-    expose: True
-    charm: ../../glance.charm
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      pool-type: erasure-coded
-      ec-profile-k: 4
-      ec-profile-m: 2
-      ec-profile-plugin: jerasure
-    to:
-      - '14'
-
-  cinder:
-    expose: True
-    charm: ch:cinder
-    num_units: 1
-    storage:
-      block-devices: '10G'
-    options:
-      openstack-origin: *openstack-origin
-      glance-api-version: 2
-      block-device: None
-    to:
-      - '16'
-    channel: 2024.1/edge
-
-  cinder-lvm:
-    charm: ch:cinder-lvm
-    options:
-      block-device: '/tmp/vol1|4G'
-      alias: zaza-lvm
-      overwrite: "true"
-      ephemeral-unmount: /mnt
-      allocation-type: auto
-      config-flags: target_helper=lioadm
-    channel: 2024.1/edge
-
-relations:
-  - - 'keystone:shared-db'
-    - 'keystone-mysql-router:shared-db'
-  - - 'keystone-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'glance:shared-db'
-    - 'glance-mysql-router:shared-db'
-  - - 'glance-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'glance:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'glance:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'glance:ceph'
-    - 'ceph-mon:client'
-
-  - - 'ceph-osd:mon'
-    - 'ceph-mon:osd'
-
-  - - 'ceph-radosgw:mon'
-    - 'ceph-mon:radosgw'
-  - - 'ceph-radosgw:identity-service'
-    - 'keystone:identity-service'
-  - - 'ceph-radosgw:object-store'
-    - 'glance:object-store'
-
-  - - 'cinder:shared-db'
-    - 'cinder-mysql-router:shared-db'
-  - - 'cinder-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'cinder:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'cinder:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'cinder:image-service'
-    - 'glance:image-service'
-  - - 'cinder:cinder-volume-service'
-    - 'glance:cinder-volume-service'
-  - - 'cinder-lvm:storage-backend'
-    - 'cinder:storage-backend'

tests/bundles/noble-caracal.yaml

@@ -62,7 +62,7 @@ applications:
       - '6'
       - '7'
       - '8'
-    channel: reef/edge
+    channel: latest/edge
 
   ceph-radosgw:
     charm: ch:ceph-radosgw
@@ -71,7 +71,7 @@ applications:
       source: *openstack-origin
     to:
       - '15'
-    channel: reef/edge
+    channel: latest/edge
 
   ceph-mon:
     charm: ch:ceph-mon
@@ -83,7 +83,7 @@ applications:
       - '9'
       - '10'
       - '11'
-    channel: reef/edge
+    channel: latest/edge
 
   rabbitmq-server:
     charm: ch:rabbitmq-server
@@ -100,7 +100,7 @@ applications:
       openstack-origin: *openstack-origin
     to:
       - '13'
-    channel: 2024.1/edge
+    channel: latest/edge
 
   glance:
     expose: True
@@ -127,7 +127,7 @@ applications:
       block-device: None
     to:
       - '16'
-    channel: 2024.1/edge
+    channel: latest/edge
 
   cinder-lvm:
     charm: ch:cinder-lvm
@@ -138,7 +138,7 @@ applications:
       ephemeral-unmount: /mnt
       allocation-type: auto
       config-flags: target_helper=lioadm
-    channel: 2024.1/edge
+    channel: latest/edge
 
 relations:
   - - 'keystone:shared-db'

tests/tests.yaml

@@ -4,11 +4,9 @@ comment:
   - 'the glance configure job validates operation of identity-service relation'
 
 smoke_bundles:
-  - jammy-caracal
+  - noble-caracal
 gate_bundles:
-  - jammy-antelope
+  - noble-caracal
-  - jammy-bobcat
-  - jammy-caracal
 dev_bundles:
   - noble-caracal
 configure: