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

charmcraft.yaml

@@ -52,67 +52,3 @@ bases:
       - name: ubuntu
         channel: "22.04"
         architectures: [arm64]
-  - build-on:
-      - name: ubuntu
-        channel: "23.04"
-        architectures: [amd64]
-    run-on:
-      - name: ubuntu
-        channel: "23.04"
-        architectures: [amd64]
-  - build-on:
-      - name: ubuntu
-        channel: "23.04"
-        architectures: [s390x]
-    run-on:
-      - name: ubuntu
-        channel: "23.04"
-        architectures: [s390x]
-  - build-on:
-      - name: ubuntu
-        channel: "23.04"
-        architectures: [ppc64el]
-    run-on:
-      - name: ubuntu
-        channel: "23.04"
-        architectures: [ppc64el]
-  - build-on:
-      - name: ubuntu
-        channel: "23.04"
-        architectures: [arm64]
-    run-on:
-      - name: ubuntu
-        channel: "23.04"
-        architectures: [arm64]
-  - build-on:
-      - name: ubuntu
-        channel: "23.10"
-        architectures: [amd64]
-    run-on:
-      - name: ubuntu
-        channel: "23.10"
-        architectures: [amd64]
-  - build-on:
-      - name: ubuntu
-        channel: "23.10"
-        architectures: [s390x]
-    run-on:
-      - name: ubuntu
-        channel: "23.10"
-        architectures: [s390x]
-  - build-on:
-      - name: ubuntu
-        channel: "23.10"
-        architectures: [ppc64el]
-    run-on:
-      - name: ubuntu
-        channel: "23.10"
-        architectures: [ppc64el]
-  - build-on:
-      - name: ubuntu
-        channel: "23.10"
-        architectures: [arm64]
-    run-on:
-      - name: ubuntu
-        channel: "23.10"
-        architectures: [arm64]

osci.yaml

@@ -6,4 +6,4 @@
       needs_charm_build: true
       charm_build_name: designate
       build_type: charmcraft
-      charmcraft_channel: 2.x/edge
+      charmcraft_channel: 2.x/stable

src/metadata.yaml

@@ -10,12 +10,10 @@ description: |
   * Support for PowerDNS and Bind9 out of the box
 docs: https://discourse.charmhub.io/t/designate-docs-index/11220
 tags:
-- openstack
+  - openstack
-- dns
+  - dns
 series:
-- jammy
+  - jammy
-- lunar
-- mantic
 subordinate: false
 provides:
   dnsaas:

src/tests/bundles/jammy-antelope.yaml

@@ -55,7 +55,7 @@ applications:
       openstack-origin: *openstack-origin
     to:
     - '4'
-    channel: latest/edge
+    channel: 2024.1/edge
 
   neutron-api:
     charm: ch:neutron-api
@@ -65,7 +65,7 @@ applications:
       openstack-origin: *openstack-origin
     to:
     - '5'
-    channel: latest/edge
+    channel: 2024.1/edge
 
   designate-bind:
     charm: ch:designate-bind
@@ -75,7 +75,7 @@ applications:
       #openstack-origin: *openstack-origin
     to:
     - '6'
-    channel: latest/edge
+    channel: 2024.1/edge
 
   memcached:
     charm: ch:memcached

src/tests/bundles/jammy-bobcat.yaml

@@ -55,7 +55,7 @@ applications:
       openstack-origin: *openstack-origin
     to:
     - '4'
-    channel: latest/edge
+    channel: 2024.1/edge
 
   neutron-api:
     charm: ch:neutron-api
@@ -65,7 +65,7 @@ applications:
       openstack-origin: *openstack-origin
     to:
     - '5'
-    channel: latest/edge
+    channel: 2024.1/edge
 
   designate-bind:
     charm: ch:designate-bind
@@ -75,7 +75,7 @@ applications:
       #openstack-origin: *openstack-origin
     to:
     - '6'
-    channel: latest/edge
+    channel: 2024.1/edge
 
   memcached:
     charm: ch:memcached

src/tests/bundles/jammy-caracal.yaml

@@ -1,9 +1,9 @@
 variables:
-  openstack-origin: &openstack-origin distro
+  openstack-origin: &openstack-origin cloud:jammy-caracal
 
 local_overlay_enabled: False
 
-series: mantic
+series: jammy
 
 machines:
   '0':
@@ -55,7 +55,7 @@ applications:
       openstack-origin: *openstack-origin
     to:
     - '4'
-    channel: latest/edge
+    channel: 2024.1/edge
 
   neutron-api:
     charm: ch:neutron-api
@@ -65,7 +65,7 @@ applications:
       openstack-origin: *openstack-origin
     to:
     - '5'
-    channel: latest/edge
+    channel: 2024.1/edge
 
   designate-bind:
     charm: ch:designate-bind
@@ -75,18 +75,18 @@ applications:
       #openstack-origin: *openstack-origin
     to:
     - '6'
-    channel: latest/edge
+    channel: 2024.1/edge
 
   memcached:
     charm: ch:memcached
     num_units: 1
-    # Note that holding memcached at focal as it's not available at mantic yet.
+    # Note that holding memcached at focal as it's not available at jammy yet.
     series: focal
     to:
     - '7'
 
   designate:
-    charm: ../../../designate_ubuntu-23.10-amd64.charm
+    charm: ../../../designate_ubuntu-22.04-amd64.charm
     num_units: 1
     options:
       nameservers: 'ns1.amuletexample.com. ns2.amuletexample.com.'

src/tests/bundles/noble-caracal.yaml

@@ -3,7 +3,7 @@ variables:
 
 local_overlay_enabled: False
 
-series: lunar
+series: noble
 
 machines:
   '0':
@@ -55,7 +55,7 @@ applications:
       openstack-origin: *openstack-origin
     to:
     - '4'
-    channel: latest/edge
+    channel: 2024.1/edge
 
   neutron-api:
     charm: ch:neutron-api
@@ -65,7 +65,7 @@ applications:
       openstack-origin: *openstack-origin
     to:
     - '5'
-    channel: latest/edge
+    channel: 2024.1/edge
 
   designate-bind:
     charm: ch:designate-bind
@@ -75,18 +75,18 @@ applications:
       #openstack-origin: *openstack-origin
     to:
     - '6'
-    channel: latest/edge
+    channel: 2024.1/edge
 
   memcached:
     charm: ch:memcached
     num_units: 1
-    # Note that holding memcached at focal as it's not available at lunar yet.
+    # Note that holding memcached at focal as it's not available at jammy yet.
     series: focal
     to:
     - '7'
 
   designate:
-    charm: ../../../designate_ubuntu-23.04-amd64.charm
+    charm: ../../../designate_ubuntu-22.04-amd64.charm
     num_units: 1
     options:
       nameservers: 'ns1.amuletexample.com. ns2.amuletexample.com.'

src/tests/tests.yaml

@@ -1,16 +1,13 @@
 charm_name: designate
 
 smoke_bundles:
-  - jammy-antelope
+  - jammy-caracal
-
 gate_bundles:
   - jammy-antelope
-
-dev_bundles:
   - jammy-bobcat
-  - lunar-antelope
+  - jammy-caracal
-  - mantic-bobcat
+dev_bundles:
-
+  - noble-caracal
 tests:
   - zaza.openstack.charm_tests.designate.tests.DesignateTests
 
@@ -23,7 +20,4 @@ tests_options:
   force_deploy:
     # nrpe charm doesn't support jammy+ and needs to be force installed
     # https://bugs.launchpad.net/charm-nrpe/+bug/1968008
-    - jammy-antelope
+    - noble-caracal
-    - jammy-bobcat
-    - lunar-antelope
-    - mantic-bobcat