From fc204823b18609ae7522626dfd6dff94b15cabe0 Mon Sep 17 00:00:00 2001
From: Luciano Lo Giudice <luciano.logiudice@canonical.com>
Date: Fri, 17 May 2024 12:46:00 -0300
Subject: [PATCH] Caracal-Squid enablement for ceph-iscsi

Change-Id: Iba3a572d7429d8fa62bf52b4e5393a765efdfbc0
---
 charmcraft.yaml                  | 3 ---
 metadata.yaml                    | 1 -
 tests/bundles/focal-ec.yaml      | 4 ++--
 tests/bundles/focal.yaml         | 4 ++--
 tests/bundles/jammy-ec.yaml      | 4 ++--
 tests/bundles/jammy-reef-ec.yaml | 4 ++--
 tests/bundles/jammy-reef.yaml    | 4 ++--
 tests/bundles/jammy.yaml         | 4 ++--
 8 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/charmcraft.yaml b/charmcraft.yaml
index 52f9254..2edbf32 100644
--- a/charmcraft.yaml
+++ b/charmcraft.yaml
@@ -36,6 +36,3 @@ bases:
       - name: ubuntu
         channel: "22.10"
         architectures: [amd64, s390x, ppc64el, arm64]
-      - name: ubuntu
-        channel: "23.04"
-        architectures: [amd64, s390x, ppc64el, arm64]
diff --git a/metadata.yaml b/metadata.yaml
index 452d26e..e98e9c2 100644
--- a/metadata.yaml
+++ b/metadata.yaml
@@ -13,7 +13,6 @@ tags:
 series:
 - focal
 - jammy
-- lunar
 subordinate: false
 min-juju-version: 2.7.6
 extra-bindings:
diff --git a/tests/bundles/focal-ec.yaml b/tests/bundles/focal-ec.yaml
index f27597f..d72f97a 100644
--- a/tests/bundles/focal-ec.yaml
+++ b/tests/bundles/focal-ec.yaml
@@ -58,7 +58,7 @@ applications:
       - '11'
       - '12'
       - '13'
-    channel: latest/edge
+    channel: quincy/edge
   ceph-mon:
     charm: ch:ceph-mon
     num_units: 3
@@ -69,7 +69,7 @@ applications:
       - '3'
       - '4'
       - '5'
-    channel: latest/edge
+    channel: quincy/edge
   vault:
     num_units: 1
     charm: ch:vault
diff --git a/tests/bundles/focal.yaml b/tests/bundles/focal.yaml
index 951cfaa..cab5a7d 100644
--- a/tests/bundles/focal.yaml
+++ b/tests/bundles/focal.yaml
@@ -55,7 +55,7 @@ applications:
       - '11'
       - '12'
       - '13'
-    channel: latest/edge
+    channel: quincy/edge
   ceph-mon:
     charm: ch:ceph-mon
     num_units: 3
@@ -66,7 +66,7 @@ applications:
       - '3'
       - '4'
       - '5'
-    channel: latest/edge
+    channel: quincy/edge
   vault:
     num_units: 1
     charm: ch:vault
diff --git a/tests/bundles/jammy-ec.yaml b/tests/bundles/jammy-ec.yaml
index 9de7d4f..3bcc745 100644
--- a/tests/bundles/jammy-ec.yaml
+++ b/tests/bundles/jammy-ec.yaml
@@ -58,7 +58,7 @@ applications:
       - '11'
       - '12'
       - '13'
-    channel: latest/edge
+    channel: quincy/edge
   ceph-mon:
     charm: ch:ceph-mon
     num_units: 3
@@ -69,7 +69,7 @@ applications:
       - '3'
       - '4'
       - '5'
-    channel: latest/edge
+    channel: quincy/edge
   vault:
     num_units: 1
     charm: ch:vault
diff --git a/tests/bundles/jammy-reef-ec.yaml b/tests/bundles/jammy-reef-ec.yaml
index 646f850..a611c26 100644
--- a/tests/bundles/jammy-reef-ec.yaml
+++ b/tests/bundles/jammy-reef-ec.yaml
@@ -58,7 +58,7 @@ applications:
       - '11'
       - '12'
       - '13'
-    channel: latest/edge
+    channel: reef/edge
   ceph-mon:
     charm: ch:ceph-mon
     num_units: 3
@@ -69,7 +69,7 @@ applications:
       - '3'
       - '4'
       - '5'
-    channel: latest/edge
+    channel: reef/edge
   vault:
     num_units: 1
     charm: ch:vault
diff --git a/tests/bundles/jammy-reef.yaml b/tests/bundles/jammy-reef.yaml
index 70d043d..fafd046 100644
--- a/tests/bundles/jammy-reef.yaml
+++ b/tests/bundles/jammy-reef.yaml
@@ -59,7 +59,7 @@ applications:
       - '11'
       - '12'
       - '13'
-    channel: latest/edge
+    channel: reef/edge
   ceph-mon:
     charm: ch:ceph-mon
     num_units: 3
@@ -70,7 +70,7 @@ applications:
       - '3'
       - '4'
       - '5'
-    channel: latest/edge
+    channel: reef/edge
   vault:
     num_units: 1
     charm: ch:vault
diff --git a/tests/bundles/jammy.yaml b/tests/bundles/jammy.yaml
index 4c26c99..0a63de9 100644
--- a/tests/bundles/jammy.yaml
+++ b/tests/bundles/jammy.yaml
@@ -59,7 +59,7 @@ applications:
       - '11'
       - '12'
       - '13'
-    channel: latest/edge
+    channel: quincy/edge
   ceph-mon:
     charm: ch:ceph-mon
     num_units: 3
@@ -70,7 +70,7 @@ applications:
       - '3'
       - '4'
       - '5'
-    channel: latest/edge
+    channel: quincy/edge
   vault:
     num_units: 1
     charm: ch:vault