Updates for caracal testing support

These updates, on the master branch, are to support testing the caracal
packages and support of the charms for caracal.  They do NOT lock the charms
down, and don't change the testing branches to stable branches.

Change-Id: Ibeb30f94417630f023a0df0f8c81fa42a19fe1ee

charmcraft.yaml

@@ -29,9 +29,3 @@ bases:
       - name: ubuntu
         channel: "22.04"
         architectures: [amd64, s390x, ppc64el, arm64]
-      - name: ubuntu
-        channel: "23.04"
-        architectures: [amd64, s390x, ppc64el, arm64]
-      - name: ubuntu
-        channel: "23.10"
-        architectures: [amd64, s390x, ppc64el, arm64]

metadata.yaml

@@ -2,8 +2,8 @@ name: cinder-nimblestorage
 summary: NimbleStorage integration for OpenStack Block Storage
 maintainer: OpenStack Charmers <openstack-charmers@lists.ubuntu.com>
 description: |
- Cinder is the block storage service for the Openstack project.
+  Cinder is the block storage service for the Openstack project.
- This charm provides a NimbleStorage backend for Cinder.
+  This charm provides a NimbleStorage backend for Cinder.
 tags:
   - openstack
   - storage
@@ -11,8 +11,6 @@ tags:
   - misc
 series:
   - jammy
-  - lunar
-  - mantic
 subordinate: true
 provides:
   storage-backend:

osci.yaml

@@ -7,4 +7,4 @@
       needs_charm_build: true
       charm_build_name: cinder-nimblestorage
       build_type: charmcraft
-      charmcraft_channel: 2.1/stable
+      charmcraft_channel: 2.x/stable

tests/bundles/jammy-antelope.yaml

@@ -37,7 +37,7 @@ applications:
       - '3'
   keystone:
     charm: ch:keystone
-    channel: latest/edge
+    channel: 2024.1/edge
     options:
       openstack-origin: *openstack-origin
     num_units: 1
@@ -48,7 +48,7 @@ applications:
     channel: latest/edge
   cinder:
     charm: ch:cinder
-    channel: latest/edge
+    channel: 2024.1/edge
     num_units: 1
     storage:
       block-devices: '40G'

tests/bundles/jammy-bobcat.yaml

@@ -37,7 +37,7 @@ applications:
       - '3'
   keystone:
     charm: ch:keystone
-    channel: latest/edge
+    channel: 2024.1/edge
     options:
       openstack-origin: *openstack-origin
     num_units: 1
@@ -48,7 +48,7 @@ applications:
     channel: latest/edge
   cinder:
     charm: ch:cinder
-    channel: latest/edge
+    channel: 2024.1/edge
     num_units: 1
     storage:
       block-devices: '40G'

tests/bundles/jammy-caracal.yaml

@@ -1,6 +1,6 @@
-series: mantic
+series: jammy
 variables:
-  openstack-origin: &openstack-origin distro
+  openstack-origin: &openstack-origin cloud:jammy-caracal
 comment:
   - machines section to decide order of deployment. database sooner = faster
 
@@ -37,7 +37,7 @@ applications:
       - '3'
   keystone:
     charm: ch:keystone
-    channel: latest/edge
+    channel: 2024.1/edge
     options:
       openstack-origin: *openstack-origin
     num_units: 1
@@ -48,7 +48,7 @@ applications:
     channel: latest/edge
   cinder:
     charm: ch:cinder
-    channel: latest/edge
+    channel: 2024.1/edge
     num_units: 1
     storage:
       block-devices: '40G'

tests/bundles/noble-caracal.yaml

@@ -1,4 +1,4 @@
-series: lunar
+series: noble
 variables:
   openstack-origin: &openstack-origin distro
 comment:
@@ -37,7 +37,7 @@ applications:
       - '3'
   keystone:
     charm: ch:keystone
-    channel: latest/edge
+    channel: 2024.1/edge
     options:
       openstack-origin: *openstack-origin
     num_units: 1
@@ -48,7 +48,7 @@ applications:
     channel: latest/edge
   cinder:
     charm: ch:cinder
-    channel: latest/edge
+    channel: 2024.1/edge
     num_units: 1
     storage:
       block-devices: '40G'

tests/tests.yaml

@@ -5,13 +5,12 @@ configure:
   - zaza.openstack.charm_tests.keystone.setup.add_demo_user
 gate_bundles:
   - jammy-antelope
-dev_bundles:
   - jammy-bobcat
-  - lunar-antelope
+  - jammy-caracal
-  - mantic-bobcat
+dev_bundles:
+  - noble-caracal
 smoke_bundles:
-  - jammy-antelope
+  - jammy-caracal
 tests_options:
   force_deploy:
-    - lunar-antelope
+    - noble-caracal
-    - mantic-bobcat