Add charmcraft 3 support

Summary of changes:
- 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
- Drop non-noble tests
- Update constraints file from -2024.1.txt to -noble.txt
- Add charmbuild to .zuul.yaml

Change-Id: I7699bc4b0535ad9034bf6096d91aaafb263d26f7

.zuul.yaml

@@ -2,3 +2,8 @@
     templates:
       - openstack-python3-charm-jobs
       - openstack-cover-jobs
+    check:
+      jobs:
+        - charmbuild
+    vars:
+      charm_build_name: cinder-backup-swift-proxy

charmcraft.yaml

@@ -19,36 +19,17 @@ parts:
     build-environment:
       - CHARM_INTERFACES_DIR: $CRAFT_PROJECT_DIR/interfaces/
       - CHARM_LAYERS_DIR: $CRAFT_PROJECT_DIR/layers/
-bases:
+base: ubuntu@24.04
-  - build-on:
+platforms:
-      - name: ubuntu
+ amd64:
-        channel: "22.04"
+   build-on: amd64
-        architectures: [amd64]
+   build-for: amd64
-    run-on:
+ arm64:
-      - name: ubuntu
+   build-on: arm64
-        channel: "22.04"
+   build-for: arm64
-        architectures: [amd64]
+ ppc64el:
-  - build-on:
+   build-on: ppc64el
-      - name: ubuntu
+   build-for: ppc64el
-        channel: "22.04"
+ s390x:
-        architectures: [s390x]
+   build-on: s390x
-    run-on:
+   build-for: s390x
-      - name: ubuntu
-        channel: "22.04"
-        architectures: [s390x]
-  - build-on:
-      - name: ubuntu
-        channel: "22.04"
-        architectures: [ppc64el]
-    run-on:
-      - name: ubuntu
-        channel: "22.04"
-        architectures: [ppc64el]
-  - build-on:
-      - name: ubuntu
-        channel: "22.04"
-        architectures: [arm64]
-    run-on:
-      - name: ubuntu
-        channel: "22.04"
-        architectures: [arm64]

osci.yaml

@@ -6,4 +6,4 @@
       needs_charm_build: true
       charm_build_name: cinder-backup-swift-proxy
       build_type: charmcraft
-      charmcraft_channel: 2.x/stable
+      charmcraft_channel: 3.x/stable

src/metadata.yaml

@@ -7,8 +7,6 @@ description: |
   This subordinate charm configures the Cinder backup service.
 tags:
   - misc
-series:
-  - jammy
 subordinate: true
 provides:
   backup-backend:

src/tests/bundles/jammy-antelope.yaml

@@ -1,328 +0,0 @@
-variables:
-  openstack-origin: &openstack-origin cloud:jammy-antelope
-
-local_overlay_enabled: False
-
-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':
-    constraints: mem=3072M
-  '4':
-    constraints: mem=3072M
-  '5':
-    constraints: mem=3072M
-  '6':
-  '7':
-  '8':
-  '9':
-  '10':
-  '11':
-  '12':
-  '13':
-  '14':
-  '15':
-  '16':
-  '17':
-  '18':
-  '19':
-  '20':
-  '21':
-
-applications:
-
-  keystone-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  glance-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  nova-cloud-controller-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  cinder-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  placement-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
-
-  ceph-mon:
-    charm: ch:ceph-mon
-    num_units: 3
-    options:
-      source: *openstack-origin
-      monitor-count: '3'
-    to:
-      - '6'
-      - '7'
-      - '8'
-    channel: reef/edge
-
-  ceph-osd:
-    charm: ch:ceph-osd
-    num_units: 3
-    storage:
-      osd-devices: 'cinder,10G'
-    options:
-      source: *openstack-origin
-      osd-devices: '/dev/test-non-existent'
-    to:
-      - '9'
-      - '10'
-      - '11'
-    channel: reef/edge
-
-  cinder:
-    charm: ch:cinder
-    num_units: 1
-    options:
-      block-device: None
-      openstack-origin: *openstack-origin
-      glance-api-version: 2
-    to:
-      - '12'
-    channel: 2024.1/edge
-
-  cinder-ceph:
-    charm: ch:cinder-ceph
-    num_units: 0
-    channel: 2024.1/edge
-
-  cinder-backup-swift-proxy:
-    charm: ../../../cinder-backup-swift-proxy_ubuntu-22.04-amd64.charm
-    num_units: 0
-    options:
-      auth-version: 3
-      swift-user: admin
-      swift-key: openstack
-      user-domain: admin_domain
-      project-domain: admin_domain
-      project-name: admin
-
-  glance:
-    charm: ch:glance
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '13'
-    channel: 2024.1/edge
-
-  keystone:
-    charm: ch:keystone
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '14'
-    channel: 2024.1/edge
-
-  nova-cloud-controller:
-    charm: ch:nova-cloud-controller
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '15'
-    channel: 2024.1/edge
-
-  rabbitmq-server:
-    charm: ch:rabbitmq-server
-    num_units: 1
-    to:
-      - '16'
-    channel: latest/edge
-
-  nova-compute:
-    charm: ch:nova-compute
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '17'
-    channel: 2024.1/edge
-
-  placement:
-    charm: ch:placement
-    num_units: 1
-    constraints: mem=1G
-    options:
-      openstack-origin: *openstack-origin
-    to:
-     - '18'
-    channel: 2024.1/edge
-
-# external swift
-  swift-keystone-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-
-  swift-mysql-innodb-cluster:
-    charm: ch:mysql-innodb-cluster
-    num_units: 3
-    options:
-      source: *openstack-origin
-    to:
-      - '3'
-      - '4'
-      - '5'
-    channel: latest/edge
-
-  swift-keystone:
-    charm: ch:keystone
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      admin-password: openstack
-      preferred-api-version: 3
-    to:
-      - '19'
-    channel: 2024.1/edge
-
-
-  swift-proxy:
-    charm: ch:swift-proxy
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      zone-assignment: manual
-      replicas: 1
-    to:
-      - '20'
-    channel: 2024.1/edge
-
-  swift-storage:
-    charm: ch:swift-storage
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      zone: 1
-    storage:
-      block-devices: 'cinder,10G'
-    to:
-      - '21'
-    channel: 2024.1/edge
-
-
-relations:
-
-  - - 'nova-compute:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'keystone:shared-db'
-    - 'keystone-mysql-router:shared-db'
-  - - 'keystone-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'nova-cloud-controller:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'glance:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'glance:shared-db'
-    - 'glance-mysql-router:shared-db'
-  - - 'glance-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'glance:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-cloud-controller:image-service'
-    - 'glance:image-service'
-
-  - - 'nova-compute:image-service'
-    - 'glance:image-service'
-
-  - - 'nova-cloud-controller:cloud-compute'
-    - 'nova-compute:cloud-compute'
-
-  - - 'nova-cloud-controller:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-cloud-controller:shared-db'
-    - 'nova-cloud-controller-mysql-router:shared-db'
-  - - 'nova-cloud-controller-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'placement:shared-db'
-    - 'placement-mysql-router:shared-db'
-  - - 'placement-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'placement:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'placement:placement'
-    - 'nova-cloud-controller:placement'
-
-  - - 'cinder:image-service'
-    - 'glance:image-service'
-
-  - - 'cinder:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'cinder:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'cinder:cinder-volume-service'
-    - 'nova-cloud-controller:cinder-volume-service'
-
-  - - 'cinder-ceph:storage-backend'
-    - 'cinder:storage-backend'
-
-  - - 'cinder'
-    - 'cinder-backup-swift-proxy'
-
-  - - 'ceph-mon:client'
-    - 'nova-compute:ceph'
-
-  - - 'nova-compute:ceph-access'
-    - 'cinder-ceph:ceph-access'
-
-  - - 'cinder:shared-db'
-    - 'cinder-mysql-router:shared-db'
-  - - 'cinder-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'ceph-mon:client'
-    - 'cinder-ceph:ceph'
-
-  - - 'ceph-mon:client'
-    - 'glance:ceph'
-
-  - - 'ceph-osd:mon'
-    - 'ceph-mon:osd'
-
-# external swift service
-  - - 'swift-keystone:shared-db'
-    - 'swift-keystone-mysql-router:shared-db'
-  - - 'swift-keystone-mysql-router:db-router'
-    - 'swift-mysql-innodb-cluster:db-router'
-
-  - - 'swift-proxy:identity-service'
-    - 'swift-keystone:identity-service'
-
-  - - 'swift-proxy:swift-storage'
-    - 'swift-storage:swift-storage'
-

src/tests/bundles/jammy-bobcat.yaml

@@ -1,328 +0,0 @@
-variables:
-  openstack-origin: &openstack-origin cloud:jammy-bobcat
-
-local_overlay_enabled: False
-
-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':
-    constraints: mem=3072M
-  '4':
-    constraints: mem=3072M
-  '5':
-    constraints: mem=3072M
-  '6':
-  '7':
-  '8':
-  '9':
-  '10':
-  '11':
-  '12':
-  '13':
-  '14':
-  '15':
-  '16':
-  '17':
-  '18':
-  '19':
-  '20':
-  '21':
-
-applications:
-
-  keystone-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  glance-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  nova-cloud-controller-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  cinder-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  placement-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
-
-  ceph-mon:
-    charm: ch:ceph-mon
-    num_units: 3
-    options:
-      source: *openstack-origin
-      monitor-count: '3'
-    to:
-      - '6'
-      - '7'
-      - '8'
-    channel: reef/edge
-
-  ceph-osd:
-    charm: ch:ceph-osd
-    num_units: 3
-    storage:
-      osd-devices: 'cinder,10G'
-    options:
-      source: *openstack-origin
-      osd-devices: '/dev/test-non-existent'
-    to:
-      - '9'
-      - '10'
-      - '11'
-    channel: reef/edge
-
-  cinder:
-    charm: ch:cinder
-    num_units: 1
-    options:
-      block-device: None
-      openstack-origin: *openstack-origin
-      glance-api-version: 2
-    to:
-      - '12'
-    channel: 2024.1/edge
-
-  cinder-ceph:
-    charm: ch:cinder-ceph
-    num_units: 0
-    channel: 2024.1/edge
-
-  cinder-backup-swift-proxy:
-    charm: ../../../cinder-backup-swift-proxy_ubuntu-22.04-amd64.charm
-    num_units: 0
-    options:
-      auth-version: 3
-      swift-user: admin
-      swift-key: openstack
-      user-domain: admin_domain
-      project-domain: admin_domain
-      project-name: admin
-
-  glance:
-    charm: ch:glance
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '13'
-    channel: 2024.1/edge
-
-  keystone:
-    charm: ch:keystone
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '14'
-    channel: 2024.1/edge
-
-  nova-cloud-controller:
-    charm: ch:nova-cloud-controller
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '15'
-    channel: 2024.1/edge
-
-  rabbitmq-server:
-    charm: ch:rabbitmq-server
-    num_units: 1
-    to:
-      - '16'
-    channel: latest/edge
-
-  nova-compute:
-    charm: ch:nova-compute
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '17'
-    channel: 2024.1/edge
-
-  placement:
-    charm: ch:placement
-    num_units: 1
-    constraints: mem=1G
-    options:
-      openstack-origin: *openstack-origin
-    to:
-     - '18'
-    channel: 2024.1/edge
-
-# external swift
-  swift-keystone-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-
-  swift-mysql-innodb-cluster:
-    charm: ch:mysql-innodb-cluster
-    num_units: 3
-    options:
-      source: *openstack-origin
-    to:
-      - '3'
-      - '4'
-      - '5'
-    channel: latest/edge
-
-  swift-keystone:
-    charm: ch:keystone
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      admin-password: openstack
-      preferred-api-version: 3
-    to:
-      - '19'
-    channel: 2024.1/edge
-
-
-  swift-proxy:
-    charm: ch:swift-proxy
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      zone-assignment: manual
-      replicas: 1
-    to:
-      - '20'
-    channel: 2024.1/edge
-
-  swift-storage:
-    charm: ch:swift-storage
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      zone: 1
-    storage:
-      block-devices: 'cinder,10G'
-    to:
-      - '21'
-    channel: 2024.1/edge
-
-
-relations:
-
-  - - 'nova-compute:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'keystone:shared-db'
-    - 'keystone-mysql-router:shared-db'
-  - - 'keystone-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'nova-cloud-controller:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'glance:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'glance:shared-db'
-    - 'glance-mysql-router:shared-db'
-  - - 'glance-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'glance:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-cloud-controller:image-service'
-    - 'glance:image-service'
-
-  - - 'nova-compute:image-service'
-    - 'glance:image-service'
-
-  - - 'nova-cloud-controller:cloud-compute'
-    - 'nova-compute:cloud-compute'
-
-  - - 'nova-cloud-controller:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-cloud-controller:shared-db'
-    - 'nova-cloud-controller-mysql-router:shared-db'
-  - - 'nova-cloud-controller-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'placement:shared-db'
-    - 'placement-mysql-router:shared-db'
-  - - 'placement-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'placement:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'placement:placement'
-    - 'nova-cloud-controller:placement'
-
-  - - 'cinder:image-service'
-    - 'glance:image-service'
-
-  - - 'cinder:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'cinder:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'cinder:cinder-volume-service'
-    - 'nova-cloud-controller:cinder-volume-service'
-
-  - - 'cinder-ceph:storage-backend'
-    - 'cinder:storage-backend'
-
-  - - 'cinder'
-    - 'cinder-backup-swift-proxy'
-
-  - - 'ceph-mon:client'
-    - 'nova-compute:ceph'
-
-  - - 'nova-compute:ceph-access'
-    - 'cinder-ceph:ceph-access'
-
-  - - 'cinder:shared-db'
-    - 'cinder-mysql-router:shared-db'
-  - - 'cinder-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'ceph-mon:client'
-    - 'cinder-ceph:ceph'
-
-  - - 'ceph-mon:client'
-    - 'glance:ceph'
-
-  - - 'ceph-osd:mon'
-    - 'ceph-mon:osd'
-
-# external swift service
-  - - 'swift-keystone:shared-db'
-    - 'swift-keystone-mysql-router:shared-db'
-  - - 'swift-keystone-mysql-router:db-router'
-    - 'swift-mysql-innodb-cluster:db-router'
-
-  - - 'swift-proxy:identity-service'
-    - 'swift-keystone:identity-service'
-
-  - - 'swift-proxy:swift-storage'
-    - 'swift-storage:swift-storage'
-

src/tests/bundles/jammy-caracal.yaml

@@ -1,328 +0,0 @@
-variables:
-  openstack-origin: &openstack-origin cloud:jammy-caracal
-
-local_overlay_enabled: False
-
-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':
-    constraints: mem=3072M
-  '4':
-    constraints: mem=3072M
-  '5':
-    constraints: mem=3072M
-  '6':
-  '7':
-  '8':
-  '9':
-  '10':
-  '11':
-  '12':
-  '13':
-  '14':
-  '15':
-  '16':
-  '17':
-  '18':
-  '19':
-  '20':
-  '21':
-
-applications:
-
-  keystone-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  glance-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  nova-cloud-controller-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  cinder-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  placement-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
-
-  ceph-mon:
-    charm: ch:ceph-mon
-    num_units: 3
-    options:
-      source: *openstack-origin
-      monitor-count: '3'
-    to:
-      - '6'
-      - '7'
-      - '8'
-    channel: reef/edge
-
-  ceph-osd:
-    charm: ch:ceph-osd
-    num_units: 3
-    storage:
-      osd-devices: 'cinder,10G'
-    options:
-      source: *openstack-origin
-      osd-devices: '/dev/test-non-existent'
-    to:
-      - '9'
-      - '10'
-      - '11'
-    channel: reef/edge
-
-  cinder:
-    charm: ch:cinder
-    num_units: 1
-    options:
-      block-device: None
-      openstack-origin: *openstack-origin
-      glance-api-version: 2
-    to:
-      - '12'
-    channel: 2024.1/edge
-
-  cinder-ceph:
-    charm: ch:cinder-ceph
-    num_units: 0
-    channel: 2024.1/edge
-
-  cinder-backup-swift-proxy:
-    charm: ../../../cinder-backup-swift-proxy_ubuntu-22.04-amd64.charm
-    num_units: 0
-    options:
-      auth-version: 3
-      swift-user: admin
-      swift-key: openstack
-      user-domain: admin_domain
-      project-domain: admin_domain
-      project-name: admin
-
-  glance:
-    charm: ch:glance
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '13'
-    channel: 2024.1/edge
-
-  keystone:
-    charm: ch:keystone
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '14'
-    channel: 2024.1/edge
-
-  nova-cloud-controller:
-    charm: ch:nova-cloud-controller
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '15'
-    channel: 2024.1/edge
-
-  rabbitmq-server:
-    charm: ch:rabbitmq-server
-    num_units: 1
-    to:
-      - '16'
-    channel: latest/edge
-
-  nova-compute:
-    charm: ch:nova-compute
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '17'
-    channel: 2024.1/edge
-
-  placement:
-    charm: ch:placement
-    num_units: 1
-    constraints: mem=1G
-    options:
-      openstack-origin: *openstack-origin
-    to:
-     - '18'
-    channel: 2024.1/edge
-
-# external swift
-  swift-keystone-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-
-  swift-mysql-innodb-cluster:
-    charm: ch:mysql-innodb-cluster
-    num_units: 3
-    options:
-      source: *openstack-origin
-    to:
-      - '3'
-      - '4'
-      - '5'
-    channel: latest/edge
-
-  swift-keystone:
-    charm: ch:keystone
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      admin-password: openstack
-      preferred-api-version: 3
-    to:
-      - '19'
-    channel: 2024.1/edge
-
-
-  swift-proxy:
-    charm: ch:swift-proxy
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      zone-assignment: manual
-      replicas: 1
-    to:
-      - '20'
-    channel: 2024.1/edge
-
-  swift-storage:
-    charm: ch:swift-storage
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      zone: 1
-    storage:
-      block-devices: 'cinder,10G'
-    to:
-      - '21'
-    channel: 2024.1/edge
-
-
-relations:
-
-  - - 'nova-compute:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'keystone:shared-db'
-    - 'keystone-mysql-router:shared-db'
-  - - 'keystone-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'nova-cloud-controller:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'glance:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'glance:shared-db'
-    - 'glance-mysql-router:shared-db'
-  - - 'glance-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'glance:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-cloud-controller:image-service'
-    - 'glance:image-service'
-
-  - - 'nova-compute:image-service'
-    - 'glance:image-service'
-
-  - - 'nova-cloud-controller:cloud-compute'
-    - 'nova-compute:cloud-compute'
-
-  - - 'nova-cloud-controller:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-cloud-controller:shared-db'
-    - 'nova-cloud-controller-mysql-router:shared-db'
-  - - 'nova-cloud-controller-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'placement:shared-db'
-    - 'placement-mysql-router:shared-db'
-  - - 'placement-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'placement:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'placement:placement'
-    - 'nova-cloud-controller:placement'
-
-  - - 'cinder:image-service'
-    - 'glance:image-service'
-
-  - - 'cinder:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'cinder:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'cinder:cinder-volume-service'
-    - 'nova-cloud-controller:cinder-volume-service'
-
-  - - 'cinder-ceph:storage-backend'
-    - 'cinder:storage-backend'
-
-  - - 'cinder'
-    - 'cinder-backup-swift-proxy'
-
-  - - 'ceph-mon:client'
-    - 'nova-compute:ceph'
-
-  - - 'nova-compute:ceph-access'
-    - 'cinder-ceph:ceph-access'
-
-  - - 'cinder:shared-db'
-    - 'cinder-mysql-router:shared-db'
-  - - 'cinder-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'ceph-mon:client'
-    - 'cinder-ceph:ceph'
-
-  - - 'ceph-mon:client'
-    - 'glance:ceph'
-
-  - - 'ceph-osd:mon'
-    - 'ceph-mon:osd'
-
-# external swift service
-  - - 'swift-keystone:shared-db'
-    - 'swift-keystone-mysql-router:shared-db'
-  - - 'swift-keystone-mysql-router:db-router'
-    - 'swift-mysql-innodb-cluster:db-router'
-
-  - - 'swift-proxy:identity-service'
-    - 'swift-keystone:identity-service'
-
-  - - 'swift-proxy:swift-storage'
-    - 'swift-storage:swift-storage'
-

src/tests/bundles/noble-caracal.yaml

@@ -76,7 +76,7 @@ applications:
       - '6'
       - '7'
       - '8'
-    channel: reef/edge
+    channel: latest/edge
 
   ceph-osd:
     charm: ch:ceph-osd
@@ -90,7 +90,7 @@ applications:
       - '9'
       - '10'
       - '11'
-    channel: reef/edge
+    channel: latest/edge
 
   cinder:
     charm: ch:cinder
@@ -101,15 +101,15 @@ applications:
       glance-api-version: 2
     to:
       - '12'
-    channel: 2024.1/edge
+    channel: latest/edge
 
   cinder-ceph:
     charm: ch:cinder-ceph
     num_units: 0
-    channel: 2024.1/edge
+    channel: latest/edge
 
   cinder-backup-swift-proxy:
-    charm: ../../../cinder-backup-swift-proxy_ubuntu-22.04-amd64.charm
+    charm: ../../../cinder-backup-swift-proxy_amd64.charm
     num_units: 0
     options:
       auth-version: 3
@@ -126,7 +126,7 @@ applications:
       openstack-origin: *openstack-origin
     to:
       - '13'
-    channel: 2024.1/edge
+    channel: latest/edge
 
   keystone:
     charm: ch:keystone
@@ -135,7 +135,7 @@ applications:
       openstack-origin: *openstack-origin
     to:
       - '14'
-    channel: 2024.1/edge
+    channel: latest/edge
 
   nova-cloud-controller:
     charm: ch:nova-cloud-controller
@@ -144,7 +144,7 @@ applications:
       openstack-origin: *openstack-origin
     to:
       - '15'
-    channel: 2024.1/edge
+    channel: latest/edge
 
   rabbitmq-server:
     charm: ch:rabbitmq-server
@@ -160,7 +160,7 @@ applications:
       openstack-origin: *openstack-origin
     to:
       - '17'
-    channel: 2024.1/edge
+    channel: latest/edge
 
   placement:
     charm: ch:placement
@@ -170,7 +170,7 @@ applications:
       openstack-origin: *openstack-origin
     to:
      - '18'
-    channel: 2024.1/edge
+    channel: latest/edge
 
 # external swift
   swift-keystone-mysql-router:
@@ -197,7 +197,7 @@ applications:
       preferred-api-version: 3
     to:
       - '19'
-    channel: 2024.1/edge
+    channel: latest/edge
 
 
   swift-proxy:
@@ -209,7 +209,7 @@ applications:
       replicas: 1
     to:
       - '20'
-    channel: 2024.1/edge
+    channel: latest/edge
 
   swift-storage:
     charm: ch:swift-storage
@@ -221,7 +221,7 @@ applications:
       block-devices: 'cinder,10G'
     to:
       - '21'
-    channel: 2024.1/edge
+    channel: latest/edge
 
 
 relations:

src/tests/tests.yaml

@@ -1,12 +1,10 @@
 charm_name: cinder-backup-swift-proxy
 gate_bundles:
-  - jammy-antelope
+  - noble-caracal
-  - jammy-bobcat
-  - jammy-caracal
 dev_bundles:
   - noble-caracal
 smoke_bundles:
-  - jammy-caracal
+  - noble-caracal
 configure:
   - zaza.openstack.charm_tests.cinder_backup_swift_proxy.setup.configure_cinder_backup
 tests:

src/tox.ini

@@ -26,7 +26,7 @@ passenv =
     OS_*
     TEST_*
 deps =
-    -c {env:TEST_CONSTRAINTS_FILE:https://raw.githubusercontent.com/openstack-charmers/zaza-openstack-tests/master/constraints/constraints-2024.1.txt}
+    -c {env:TEST_CONSTRAINTS_FILE:https://raw.githubusercontent.com/openstack-charmers/zaza-openstack-tests/master/constraints/constraints-noble.txt}
     -r{toxinidir}/test-requirements.txt
 
 [testenv:pep8]

tox.ini

@@ -60,21 +60,21 @@ commands =
 [testenv:py3]
 basepython = python3
 deps =
-    -c {env:TEST_CONSTRAINTS_FILE:https://raw.githubusercontent.com/openstack-charmers/zaza-openstack-tests/master/constraints/constraints-2024.1.txt}
+    -c {env:TEST_CONSTRAINTS_FILE:https://raw.githubusercontent.com/openstack-charmers/zaza-openstack-tests/master/constraints/constraints-noble.txt}
     -r{toxinidir}/test-requirements.txt
 commands = stestr run --slowest {posargs}
 
 [testenv:py312]
 basepython = python3.12
 deps =
-    -c {env:TEST_CONSTRAINTS_FILE:https://raw.githubusercontent.com/openstack-charmers/zaza-openstack-tests/master/constraints/constraints-2024.1.txt}
+    -c {env:TEST_CONSTRAINTS_FILE:https://raw.githubusercontent.com/openstack-charmers/zaza-openstack-tests/master/constraints/constraints-noble.txt}
     -r{toxinidir}/test-requirements.txt
 commands = stestr run --slowest {posargs}
 
 [testenv:py310]
 basepython = python3.10
 deps =
-    -c {env:TEST_CONSTRAINTS_FILE:https://raw.githubusercontent.com/openstack-charmers/zaza-openstack-tests/master/constraints/constraints-2024.1.txt}
+    -c {env:TEST_CONSTRAINTS_FILE:https://raw.githubusercontent.com/openstack-charmers/zaza-openstack-tests/master/constraints/constraints-noble.txt}
     -r{toxinidir}/test-requirements.txt
 commands = stestr run --slowest {posargs}
 
@@ -89,7 +89,7 @@ commands = flake8 {posargs} src unit_tests
 # https://github.com/openstack/nova/blob/master/tox.ini
 basepython = python3
 deps =
-    -c {env:TEST_CONSTRAINTS_FILE:https://raw.githubusercontent.com/openstack-charmers/zaza-openstack-tests/master/constraints/constraints-2024.1.txt}
+    -c {env:TEST_CONSTRAINTS_FILE:https://raw.githubusercontent.com/openstack-charmers/zaza-openstack-tests/master/constraints/constraints-noble.txt}
     -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
 setenv =