From a3c662dffeaa75626081a5e76de61c82517c5b66 Mon Sep 17 00:00:00 2001
From: Alex Kavanagh <alex.kavanagh@canonical.com>
Date: Fri, 9 Feb 2024 18:15:47 +0000
Subject: [PATCH] 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: I545a2b216bd7b3df064eeaaa63e5867c3ce81348
---
 charmcraft.yaml                                   |  6 ------
 src/metadata.yaml                                 | 12 +++++-------
 src/tests/bundles/jammy-antelope.yaml             |  2 +-
 src/tests/bundles/jammy-bobcat.yaml               |  2 +-
 .../{mantic-bobcat.yaml => jammy-caracal.yaml}    |  8 +++-----
 .../{lunar-antelope.yaml => noble-caracal.yaml}   |  6 ++----
 src/tests/tests.yaml                              | 15 +++++----------
 7 files changed, 17 insertions(+), 34 deletions(-)
 rename src/tests/bundles/{mantic-bobcat.yaml => jammy-caracal.yaml} (91%)
 rename src/tests/bundles/{lunar-antelope.yaml => noble-caracal.yaml} (94%)

diff --git a/charmcraft.yaml b/charmcraft.yaml
index 2df13f1..c31dea1 100644
--- a/charmcraft.yaml
+++ b/charmcraft.yaml
@@ -22,9 +22,3 @@ bases:
       - name: ubuntu
         channel: "22.04"
         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]
diff --git a/src/metadata.yaml b/src/metadata.yaml
index b42f1f2..6faf34c 100644
--- a/src/metadata.yaml
+++ b/src/metadata.yaml
@@ -5,14 +5,12 @@ description: |
   This charm supports the use of Kerberos as a security mechanism
   for authentication through keystone.
 tags:
-- openstack
-- identity
-- kerberos
-- ldap
+  - openstack
+  - identity
+  - kerberos
+  - ldap
 series:
-- jammy
-- lunar
-- mantic
+  - jammy
 subordinate: true
 provides:
   keystone-fid-service-provider:
diff --git a/src/tests/bundles/jammy-antelope.yaml b/src/tests/bundles/jammy-antelope.yaml
index bdd381d..6c6d817 100644
--- a/src/tests/bundles/jammy-antelope.yaml
+++ b/src/tests/bundles/jammy-antelope.yaml
@@ -47,7 +47,7 @@ applications:
       token-expiration: 60
     to:
     - '3'
-    channel: latest/edge
+    channel: 2024.1/edge
   keystone-kerberos:
     charm: ../../../keystone-kerberos.charm
     options:
diff --git a/src/tests/bundles/jammy-bobcat.yaml b/src/tests/bundles/jammy-bobcat.yaml
index 39b3e79..ae5136d 100644
--- a/src/tests/bundles/jammy-bobcat.yaml
+++ b/src/tests/bundles/jammy-bobcat.yaml
@@ -47,7 +47,7 @@ applications:
       token-expiration: 60
     to:
     - '3'
-    channel: latest/edge
+    channel: 2024.1/edge
   keystone-kerberos:
     charm: ../../../keystone-kerberos.charm
     options:
diff --git a/src/tests/bundles/mantic-bobcat.yaml b/src/tests/bundles/jammy-caracal.yaml
similarity index 91%
rename from src/tests/bundles/mantic-bobcat.yaml
rename to src/tests/bundles/jammy-caracal.yaml
index 205656b..91aa43f 100644
--- a/src/tests/bundles/mantic-bobcat.yaml
+++ b/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: mantic
+series: jammy
 comment:
 - 'machines section to decide order of deployment. database sooner = faster'
 machines:
@@ -32,8 +32,6 @@ applications:
   mysql-innodb-cluster:
     charm: ch:mysql-innodb-cluster
     num_units: 3
-    options:
-      source: *openstack-origin
     to:
     - '0'
     - '1'
@@ -49,7 +47,7 @@ applications:
       token-expiration: 60
     to:
     - '3'
-    channel: latest/edge
+    channel: 2024.1/edge
   keystone-kerberos:
     charm: ../../../keystone-kerberos.charm
     options:
diff --git a/src/tests/bundles/lunar-antelope.yaml b/src/tests/bundles/noble-caracal.yaml
similarity index 94%
rename from src/tests/bundles/lunar-antelope.yaml
rename to src/tests/bundles/noble-caracal.yaml
index 585dc94..9a4e4fd 100644
--- a/src/tests/bundles/lunar-antelope.yaml
+++ b/src/tests/bundles/noble-caracal.yaml
@@ -3,7 +3,7 @@ variables:
 
 local_overlay_enabled: False
 
-series: lunar
+series: noble
 comment:
 - 'machines section to decide order of deployment. database sooner = faster'
 machines:
@@ -32,8 +32,6 @@ applications:
   mysql-innodb-cluster:
     charm: ch:mysql-innodb-cluster
     num_units: 3
-    options:
-      source: *openstack-origin
     to:
     - '0'
     - '1'
@@ -49,7 +47,7 @@ applications:
       token-expiration: 60
     to:
     - '3'
-    channel: latest/edge
+    channel: 2024.1/edge
   keystone-kerberos:
     charm: ../../../keystone-kerberos.charm
     options:
diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml
index 86d3e1f..be128ff 100644
--- a/src/tests/tests.yaml
+++ b/src/tests/tests.yaml
@@ -1,16 +1,13 @@
 charm_name: keystone-kerberos
 
 smoke_bundles:
-  - jammy-antelope
-
+  - jammy-caracal
 gate_bundles:
   - jammy-antelope
-
-dev_bundles:
   - jammy-bobcat
-  - lunar-antelope
-  - mantic-bobcat
-
+  - jammy-caracal
+dev_bundles:
+  - noble-caracal
 configure:
   - zaza.openstack.charm_tests.kerberos.setup.run_all_configuration_steps
 
@@ -19,9 +16,7 @@ tests:
 
 tests_options:
   force_deploy:
-    - lunar-antelope
-    - mantic-bobcat
-
+    - noble-caracal
 target_deploy_status:
   keystone-kerberos:
     workload-status: blocked