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

charmcraft.yaml

@@ -47,67 +47,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: neutron-api-plugin-ovn
       build_type: charmcraft
-      charmcraft_channel: 2.x/edge
+      charmcraft_channel: 2.x/stable

src/metadata.yaml

@@ -6,11 +6,9 @@ description: |
   ``neutron-api`` units and augments Neutron's configuration for use with
   the OVN ML2 plugin.
 tags:
-- networking
+  - networking
 series:
-- jammy
+  - jammy
-- lunar
-- mantic
 subordinate: true
 requires:
   container:

src/tests/bundles/jammy-antelope.yaml

@@ -59,26 +59,26 @@ applications:
       flat-network-providers: physnet1
       neutron-security-groups: true
       openstack-origin: *openstack-origin
-    channel: latest/edge
+    channel: 2024.1/edge
   keystone:
     charm: ch:keystone
     num_units: 1
     options:
       openstack-origin: *openstack-origin
-    channel: latest/edge
+    channel: 2024.1/edge
   glance:
     charm: ch:glance
     num_units: 1
     options:
       openstack-origin: *openstack-origin
-    channel: latest/edge
+    channel: 2024.1/edge
   nova-cloud-controller:
     charm: ch:nova-cloud-controller
     num_units: 1
     options:
       network-manager: Neutron
       openstack-origin: *openstack-origin
-    channel: latest/edge
+    channel: 2024.1/edge
   ovn-chassis:
     charm: ch:ovn-chassis
     channel: latest/edge
@@ -92,13 +92,13 @@ applications:
       enable-resize: true
       migration-auth-type: ssh
       openstack-origin: *openstack-origin
-    channel: latest/edge
+    channel: 2024.1/edge
   placement:
     charm: ch:placement
     num_units: 1
     options:
       openstack-origin: *openstack-origin
-    channel: latest/edge
+    channel: 2024.1/edge
 relations:
   - - hacluster-neutron-api:ha
     - neutron-api:ha

src/tests/bundles/jammy-bobcat.yaml

@@ -59,26 +59,26 @@ applications:
       flat-network-providers: physnet1
       neutron-security-groups: true
       openstack-origin: *openstack-origin
-    channel: latest/edge
+    channel: 2024.1/edge
   keystone:
     charm: ch:keystone
     num_units: 1
     options:
       openstack-origin: *openstack-origin
-    channel: latest/edge
+    channel: 2024.1/edge
   glance:
     charm: ch:glance
     num_units: 1
     options:
       openstack-origin: *openstack-origin
-    channel: latest/edge
+    channel: 2024.1/edge
   nova-cloud-controller:
     charm: ch:nova-cloud-controller
     num_units: 1
     options:
       network-manager: Neutron
       openstack-origin: *openstack-origin
-    channel: latest/edge
+    channel: 2024.1/edge
   ovn-chassis:
     charm: ch:ovn-chassis
     channel: latest/edge
@@ -92,13 +92,13 @@ applications:
       enable-resize: true
       migration-auth-type: ssh
       openstack-origin: *openstack-origin
-    channel: latest/edge
+    channel: 2024.1/edge
   placement:
     charm: ch:placement
     num_units: 1
     options:
       openstack-origin: *openstack-origin
-    channel: latest/edge
+    channel: 2024.1/edge
 relations:
   - - hacluster-neutron-api:ha
     - neutron-api:ha

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: &series mantic
+series: &series jammy
 
 applications:
   keystone-mysql-router:
@@ -44,7 +44,7 @@ applications:
       source: *openstack-origin
     channel: latest/edge
   neutron-api-plugin-ovn:
-    charm: ../../../neutron-api-plugin-ovn_ubuntu-23.10-amd64.charm
+    charm: ../../../neutron-api-plugin-ovn_ubuntu-22.04-amd64.charm
   hacluster-neutron-api:
     charm: ch:hacluster
     channel: latest/edge
@@ -59,26 +59,26 @@ applications:
       flat-network-providers: physnet1
       neutron-security-groups: true
       openstack-origin: *openstack-origin
-    channel: latest/edge
+    channel: 2024.1/edge
   keystone:
     charm: ch:keystone
     num_units: 1
     options:
       openstack-origin: *openstack-origin
-    channel: latest/edge
+    channel: 2024.1/edge
   glance:
     charm: ch:glance
     num_units: 1
     options:
       openstack-origin: *openstack-origin
-    channel: latest/edge
+    channel: 2024.1/edge
   nova-cloud-controller:
     charm: ch:nova-cloud-controller
     num_units: 1
     options:
       network-manager: Neutron
       openstack-origin: *openstack-origin
-    channel: latest/edge
+    channel: 2024.1/edge
   ovn-chassis:
     charm: ch:ovn-chassis
     channel: latest/edge
@@ -92,13 +92,13 @@ applications:
       enable-resize: true
       migration-auth-type: ssh
       openstack-origin: *openstack-origin
-    channel: latest/edge
+    channel: 2024.1/edge
   placement:
     charm: ch:placement
     num_units: 1
     options:
       openstack-origin: *openstack-origin
-    channel: latest/edge
+    channel: 2024.1/edge
 relations:
   - - hacluster-neutron-api:ha
     - neutron-api:ha

src/tests/bundles/noble-caracal.yaml

@@ -3,7 +3,7 @@ variables:
 
 local_overlay_enabled: False
 
-series: &series lunar
+series: &series noble
 
 applications:
   keystone-mysql-router:
@@ -44,7 +44,7 @@ applications:
       source: *openstack-origin
     channel: latest/edge
   neutron-api-plugin-ovn:
-    charm: ../../../neutron-api-plugin-ovn_ubuntu-23.04-amd64.charm
+    charm: ../../../neutron-api-plugin-ovn_ubuntu-22.04-amd64.charm
   hacluster-neutron-api:
     charm: ch:hacluster
     channel: latest/edge
@@ -59,26 +59,26 @@ applications:
       flat-network-providers: physnet1
       neutron-security-groups: true
       openstack-origin: *openstack-origin
-    channel: latest/edge
+    channel: 2024.1/edge
   keystone:
     charm: ch:keystone
     num_units: 1
     options:
       openstack-origin: *openstack-origin
-    channel: latest/edge
+    channel: 2024.1/edge
   glance:
     charm: ch:glance
     num_units: 1
     options:
       openstack-origin: *openstack-origin
-    channel: latest/edge
+    channel: 2024.1/edge
   nova-cloud-controller:
     charm: ch:nova-cloud-controller
     num_units: 1
     options:
       network-manager: Neutron
       openstack-origin: *openstack-origin
-    channel: latest/edge
+    channel: 2024.1/edge
   ovn-chassis:
     charm: ch:ovn-chassis
     channel: latest/edge
@@ -92,13 +92,13 @@ applications:
       enable-resize: true
       migration-auth-type: ssh
       openstack-origin: *openstack-origin
-    channel: latest/edge
+    channel: 2024.1/edge
   placement:
     charm: ch:placement
     num_units: 1
     options:
       openstack-origin: *openstack-origin
-    channel: latest/edge
+    channel: 2024.1/edge
 relations:
   - - hacluster-neutron-api:ha
     - neutron-api:ha

src/tests/tests.yaml

@@ -1,16 +1,13 @@
 charm_name: neutron-api-plugin-ovn
 
 smoke_bundles:
-- jammy-antelope
+  - jammy-caracal
-
 gate_bundles:
-- jammy-antelope
+  - jammy-antelope
-
+  - jammy-bobcat
+  - jammy-caracal
 dev_bundles:
-- jammy-bobcat
+  - noble-caracal
-- lunar-antelope
-- mantic-bobcat
-
 target_deploy_status:
   neutron-api-plugin-ovn:
     workload-status: waiting
@@ -26,16 +23,15 @@ target_deploy_status:
     workload-status-message-prefix: Vault needs to be initialized
 
 configure:
-- zaza.openstack.charm_tests.vault.setup.auto_initialize
+  - zaza.openstack.charm_tests.vault.setup.auto_initialize
-- zaza.openstack.charm_tests.glance.setup.add_lts_image
+  - zaza.openstack.charm_tests.glance.setup.add_lts_image
-- zaza.openstack.charm_tests.neutron.setup.basic_overcloud_network
+  - zaza.openstack.charm_tests.neutron.setup.basic_overcloud_network
-- zaza.openstack.charm_tests.nova.setup.create_flavors
+  - zaza.openstack.charm_tests.nova.setup.create_flavors
-- zaza.openstack.charm_tests.nova.setup.manage_ssh_key
+  - zaza.openstack.charm_tests.nova.setup.manage_ssh_key
 
 tests:
-- zaza.openstack.charm_tests.neutron.tests.NeutronNetworkingTest
+  - zaza.openstack.charm_tests.neutron.tests.NeutronNetworkingTest
 
 tests_options:
   force_deploy:
-    - lunar-antelope
+    - noble-caracal
-    - mantic-bobcat