From 278560d9e63cd6914948b1b273f1720432116557 Mon Sep 17 00:00:00 2001
From: Corey Bryant <corey.bryant@canonical.com>
Date: Tue, 18 Jul 2023 16:47:18 -0400
Subject: [PATCH] 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
* update charmcraft_channel to 2.x/stable

Change-Id: Ibe8ab7a4884f6d7984139afc955e99f901de88e6
---
 osci.yaml                                           | 2 +-
 tests/bundles/{jammy-zed.yaml => jammy-bobcat.yaml} | 4 ++--
 tests/tests.yaml                                    | 3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)
 rename tests/bundles/{jammy-zed.yaml => jammy-bobcat.yaml} (93%)

diff --git a/osci.yaml b/osci.yaml
index 2ba66e6..452a3d3 100644
--- a/osci.yaml
+++ b/osci.yaml
@@ -5,4 +5,4 @@
       needs_charm_build: true
       charm_build_name: infinidat-tools
       build_type: charmcraft
-      charmcraft_channel: 2.1/stable
+      charmcraft_channel: 2.x/stable
diff --git a/tests/bundles/jammy-zed.yaml b/tests/bundles/jammy-bobcat.yaml
similarity index 93%
rename from tests/bundles/jammy-zed.yaml
rename to tests/bundles/jammy-bobcat.yaml
index b59fbd6..f4e62ea 100644
--- a/tests/bundles/jammy-zed.yaml
+++ b/tests/bundles/jammy-bobcat.yaml
@@ -27,7 +27,7 @@ applications:
     channel: latest/edge
     num_units: 1
     options:
-      openstack-origin: cloud:jammy-zed
+      openstack-origin: cloud:jammy-bobcat
     to:
     - '3'
   keystone-mysql-router:
@@ -38,7 +38,7 @@ applications:
     channel: latest/edge
     num_units: 1
     options:
-      openstack-origin: cloud:jammy-zed
+      openstack-origin: cloud:jammy-bobcat
     to:
     - '4'
   cinder-mysql-router:
diff --git a/tests/tests.yaml b/tests/tests.yaml
index 20162f5..ec8c55a 100644
--- a/tests/tests.yaml
+++ b/tests/tests.yaml
@@ -5,6 +5,7 @@ configure:
   - zaza.openstack.charm_tests.keystone.setup.add_demo_user
 gate_bundles:
   - jammy-antelope
-  - jammy-zed
+  - jammy-bobcat
 smoke_bundles:
   - jammy-antelope
+  - jammy-bobcat