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

Func-Test-Pr: https://github.com/openstack-charmers/zaza-openstack-tests/pull/1095
Change-Id: I0a654532bf92abb58d1265bca24c000f3e9059d2

charmcraft.yaml

@@ -22,9 +22,9 @@ bases:
       - name: ubuntu
         channel: "22.04"
         architectures: [amd64, s390x, ppc64el, arm64]
-      - name: ubuntu
-        channel: "22.10"
-        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]

osci.yaml

@@ -6,4 +6,4 @@
       needs_charm_build: true
       charm_build_name: keystone-kerberos
       build_type: charmcraft
-      charmcraft_channel: 2.1/stable
+      charmcraft_channel: 2.x/stable

src/metadata.yaml

@@ -11,8 +11,8 @@ tags:
 - ldap
 series:
 - jammy
-- kinetic
 - lunar
+- mantic
 subordinate: true
 provides:
   keystone-fid-service-provider:

src/tests/bundles/jammy-bobcat.yaml

@@ -0,0 +1,70 @@
+variables:
+  openstack-origin: &openstack-origin cloud:jammy-bobcat
+
+local_overlay_enabled: False
+
+series: jammy
+comment:
+- 'machines section to decide order of deployment. database sooner = faster'
+machines:
+  '0':
+    constraints: mem=3072M
+  '1':
+    constraints: mem=3072M
+  '2':
+    constraints: mem=3072M
+  '3':
+  '4':
+    series: focal
+  '5':
+relations:
+- - keystone:shared-db
+  - keystone-mysql-router:shared-db
+- - keystone-mysql-router:db-router
+  - mysql-innodb-cluster:db-router
+- - keystone
+  - keystone-kerberos
+applications:
+  keystone-mysql-router:
+    charm: ch:mysql-router
+    channel: latest/edge
+
+  mysql-innodb-cluster:
+    charm: ch:mysql-innodb-cluster
+    num_units: 3
+    to:
+    - '0'
+    - '1'
+    - '2'
+    channel: latest/edge
+
+  keystone:
+    charm: ch:keystone
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+      token-provider: 'fernet'
+      token-expiration: 60
+    to:
+    - '3'
+    channel: latest/edge
+  keystone-kerberos:
+    charm: ../../../keystone-kerberos.charm
+    options:
+      kerberos-realm: 'TESTUBUNTU.COM'
+      kerberos-server: 'kerberos.testubuntu.com'
+      kerberos-domain: 'k8s'
+    resource:
+      keystone_keytab: keystone.keytab
+
+  kerberos-server:
+    charm: ch:openstack-charmers-next-kerberos-test-fixture
+    series: focal
+    num_units: 1
+    to:
+      - '4'
+  ubuntu-test-host:
+    charm: cs:ubuntu
+    num_units: 1
+    to:
+      - '5'

src/tests/bundles/mantic-bobcat.yaml

@@ -1,9 +1,9 @@
 variables:
-  openstack-origin: &openstack-origin cloud:jammy-zed
+  openstack-origin: &openstack-origin distro
 
 local_overlay_enabled: False
 
-series: jammy
+series: mantic
 comment:
 - 'machines section to decide order of deployment. database sooner = faster'
 machines:

src/tests/tests.yaml

@@ -1,14 +1,15 @@
 charm_name: keystone-kerberos
 
 smoke_bundles:
-  - jammy-zed
+  - jammy-antelope
 
 gate_bundles:
-  - jammy-zed
+  - jammy-antelope
 
 dev_bundles:
-  - jammy-antelope
+  - jammy-bobcat
   - lunar-antelope
+  - mantic-bobcat
 
 configure:
   - zaza.openstack.charm_tests.kerberos.setup.run_all_configuration_steps
@@ -19,6 +20,7 @@ tests:
 tests_options:
   force_deploy:
     - lunar-antelope
+    - mantic-bobcat
 
 target_deploy_status:
   keystone-kerberos: