Add 2023.2 Bobcat support

* sync charm-helpers to classic charms
* change openstack-origin/source default to bobcat
* add mantic to metadata series
* align testing with bobcat
* add new bobcat bundles
* add bobcat bundles to tests.yaml
* add bobcat tests to osci.yaml
* update build-on and run-on bases
* drop kinetic
* update charmcraft_channel to 2.x/stable

Depends-On: https://review.opendev.org/c/openstack/charm-vault/+/890404
Change-Id: I70bd16216ef12d304cd969971edba1ab8536b136

charmcraft.yaml

@@ -20,7 +20,6 @@ parts:
       - CHARM_INTERFACES_DIR: /root/project/interfaces/
       - CHARM_LAYERS_DIR: /root/project/layers/
       - MAKEFLAGS: -j$(nproc)
-
 bases:
   - build-on:
       - name: ubuntu
@@ -30,51 +29,91 @@ bases:
       - name: ubuntu
         channel: "22.04"
         architectures: [amd64]
+  - build-on:
       - name: ubuntu
-        channel: "22.10"
+        channel: "22.04"
+        architectures: [s390x]
+    run-on:
+      - 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]
+  - build-on:
+      - name: ubuntu
+        channel: "23.04"
         architectures: [amd64]
+    run-on:
       - name: ubuntu
         channel: "23.04"
         architectures: [amd64]
   - build-on:
       - name: ubuntu
-        channel: "22.04"
-        architectures: [arm64]
+        channel: "23.04"
+        architectures: [s390x]
     run-on:
-      - name: ubuntu
-        channel: "22.04"
-        architectures: [arm64]
-      - name: ubuntu
-        channel: "22.10"
-        architectures: [arm64]
       - name: ubuntu
         channel: "23.04"
-        architectures: [arm64]
+        architectures: [s390x]
   - build-on:
       - name: ubuntu
-        channel: "22.04"
+        channel: "23.04"
         architectures: [ppc64el]
     run-on:
-      - name: ubuntu
-        channel: "22.04"
-        architectures: [ppc64el]
-      - name: ubuntu
-        channel: "22.10"
-        architectures: [ppc64el]
       - name: ubuntu
         channel: "23.04"
         architectures: [ppc64el]
   - build-on:
       - name: ubuntu
-        channel: "22.04"
+        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: "22.04"
+        channel: "23.10"
         architectures: [s390x]
+  - build-on:
       - name: ubuntu
-        channel: "22.10"
-        architectures: [s390x]
+        channel: "23.10"
+        architectures: [ppc64el]
+    run-on:
       - name: ubuntu
-        channel: "23.04"
-        architectures: [s390x]
+        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: ovn-central
       build_type: charmcraft
-      charmcraft_channel: 2.1/stable
+      charmcraft_channel: 2.x/stable

src/metadata.yaml

@@ -25,8 +25,8 @@ tags:
 - networking
 series:
 - jammy
-- kinetic
 - lunar
+- mantic
 subordinate: false
 provides:
   ovsdb:

src/tests/bundles/jammy-antelope.yaml

@@ -13,7 +13,7 @@ applications:
     channel: latest/edge
 
   ovn-central:
-    charm: ../../../ovn-central_ubuntu-22.04-amd64_ubuntu-22.10-amd64_ubuntu-23.04-amd64.charm
+    charm: ../../../ovn-central_ubuntu-22.04-amd64.charm
     num_units: 3
     options:
       source: *openstack-origin

src/tests/bundles/jammy-bobcat.yaml

@@ -1,5 +1,5 @@
 variables:
-  openstack-origin: &openstack-origin cloud:jammy-zed
+  openstack-origin: &openstack-origin cloud:jammy-bobcat
 
 local_overlay_enabled: False
 
@@ -13,7 +13,7 @@ applications:
     channel: latest/edge
 
   ovn-central:
-    charm: ../../../ovn-central_ubuntu-22.04-amd64_ubuntu-22.10-amd64_ubuntu-23.04-amd64.charm
+    charm: ../../../ovn-central_ubuntu-22.04-amd64.charm
     num_units: 3
     options:
       source: *openstack-origin

src/tests/bundles/lunar-antelope.yaml

@@ -13,7 +13,7 @@ applications:
     channel: latest/edge
 
   ovn-central:
-    charm: ../../../ovn-central_ubuntu-22.04-amd64_ubuntu-22.10-amd64_ubuntu-23.04-amd64.charm
+    charm: ../../../ovn-central_ubuntu-23.04-amd64.charm
     num_units: 3
     options:
       source: *openstack-origin

src/tests/bundles/mantic-bobcat.yaml

@@ -0,0 +1,24 @@
+variables:
+  openstack-origin: &openstack-origin distro
+
+local_overlay_enabled: False
+
+series: mantic
+
+applications:
+
+  vault:
+    charm: ch:vault
+    num_units: 1
+    channel: latest/edge
+
+  ovn-central:
+    charm: ../../../ovn-central_ubuntu-23.10-amd64.charm
+    num_units: 3
+    options:
+      source: *openstack-origin
+
+relations:
+
+  - - 'ovn-central:certificates'
+    - 'vault:certificates'

src/tests/tests.yaml

@@ -1,15 +1,15 @@
 charm_name: ovn-central
 
 gate_bundles:
-- jammy-zed
+- jammy-antelope
 
 smoke_bundles:
-- jammy-zed
+- jammy-antelope
 
 dev_bundles:
-- jammy-zed
-- jammy-antelope
+- jammy-bobcat
 - lunar-antelope
+- mantic-bobcat
 
 target_deploy_status:
   ovn-central:
@@ -35,3 +35,4 @@ tests:
 tests_options:
   force_deploy:
     - lunar-antelope
+    - mantic-bobcat