From 0628e02983605313dd82b4501d54e9c027b669c7 Mon Sep 17 00:00:00 2001
From: Felipe Reyes <felipe.reyes@canonical.com>
Date: Tue, 21 Feb 2023 14:59:31 -0300
Subject: [PATCH] Add kinetic support

Summary of changes:
- add kinetic to metadata.yaml
- add 21.10 to run-on in charmcraft.yaml
- add kinetic-zed testing bundle

Func-Test-Pr: https://github.com/openstack-charmers/zaza-openstack-tests/pull/1014
Related-Bug: #1972730
Change-Id: I28c1f16bdbe2032e678f7c92caee5ddd3fcd4a7f
---
 charmcraft.yaml                |  3 ++
 metadata.yaml                  |  1 +
 osci.yaml                      |  3 ++
 tests/bundles/kinetic-zed.yaml | 57 ++++++++++++++++++++++++++++++++++
 tests/tests.yaml               |  2 ++
 5 files changed, 66 insertions(+)
 create mode 100644 tests/bundles/kinetic-zed.yaml

diff --git a/charmcraft.yaml b/charmcraft.yaml
index ea1d266..140c495 100644
--- a/charmcraft.yaml
+++ b/charmcraft.yaml
@@ -33,3 +33,6 @@ bases:
       - name: ubuntu
         channel: "22.04"
         architectures: [amd64, s390x, ppc64el, arm64]
+      - name: ubuntu
+        channel: "22.10"
+        architectures: [amd64, s390x, ppc64el, arm64]
diff --git a/metadata.yaml b/metadata.yaml
index d31618f..bfbbc6a 100644
--- a/metadata.yaml
+++ b/metadata.yaml
@@ -9,6 +9,7 @@ tags:
 series:
 - focal
 - jammy
+- kinetic
 requires:
   juju-info:
     interface: juju-info
diff --git a/osci.yaml b/osci.yaml
index 221eb97..825dbe6 100644
--- a/osci.yaml
+++ b/osci.yaml
@@ -3,6 +3,9 @@
       - charm-unit-jobs-py38
       - charm-unit-jobs-py310
       - charm-yoga-functional-jobs
+    check:
+      jobs:
+        - kinetic-zed
     vars:
       needs_charm_build: true
       charm_build_name: hacluster
diff --git a/tests/bundles/kinetic-zed.yaml b/tests/bundles/kinetic-zed.yaml
new file mode 100644
index 0000000..37dd45e
--- /dev/null
+++ b/tests/bundles/kinetic-zed.yaml
@@ -0,0 +1,57 @@
+variables:
+  openstack-origin: &openstack-origin distro
+
+series: kinetic
+
+machines:
+  '0':
+    constraints: mem=3072M
+  '1':
+    constraints: mem=3072M
+  '2':
+    constraints: mem=3072M
+  '3':
+  '4':
+  '5':
+
+applications:
+
+  keystone-mysql-router:
+    charm: ch:mysql-router
+    channel: latest/edge
+
+  mysql-innodb-cluster:
+    charm: ch:mysql-innodb-cluster
+    num_units: 3
+    options:
+      source: *openstack-origin
+    to:
+      - '0'
+      - '1'
+      - '2'
+    channel: latest/edge
+
+  keystone:
+    charm: ch:keystone
+    num_units: 3
+    options:
+      token-expiration: 60
+      openstack-origin: *openstack-origin
+    to:
+      - '3'
+      - '4'
+      - '5'
+    channel: zed/edge
+
+  hacluster:
+    charm: ../../hacluster.charm
+    subordinate-to:
+      - keystone
+
+relations:
+  - - 'keystone:shared-db'
+    - 'keystone-mysql-router:shared-db'
+  - - 'hacluster:ha'
+    - 'keystone:ha'
+  - - "keystone-mysql-router:db-router"
+    - "mysql-innodb-cluster:db-router"
diff --git a/tests/tests.yaml b/tests/tests.yaml
index 49f94be..f766256 100644
--- a/tests/tests.yaml
+++ b/tests/tests.yaml
@@ -8,6 +8,7 @@ gate_bundles:
 
 dev_bundles:
   - jammy-yoga
+  - kinetic-zed
 
 configure:
   - zaza.openstack.charm_tests.keystone.setup.add_demo_user
@@ -22,3 +23,4 @@ tests_options:
     hacluster-charm-name: hacluster
   force_deploy:
     - jammy-yoga
+    - kinetic-zed