From ece4f2e8e014fa1d4de5652ec7b9b10393139c4e Mon Sep 17 00:00:00 2001
From: Billy Olsen <billy.olsen@canonical.com>
Date: Wed, 4 Sep 2024 06:39:41 -0700
Subject: [PATCH] Switch all main dev branches to use charmcraft3

Switch all the main developer branches to use the charmcraft 3 and 24.04
base configurations.

Signed-off-by: Billy Olsen <billy.olsen@canonical.com>
---
 .../data/lp-builder-config/misc.yaml          |  24 +--
 .../data/lp-builder-config/openstack.yaml     | 185 +++++-------------
 .../data/lp-builder-config/ovn.yaml           |   2 +-
 3 files changed, 62 insertions(+), 149 deletions(-)

diff --git a/charmed_openstack_info/data/lp-builder-config/misc.yaml b/charmed_openstack_info/data/lp-builder-config/misc.yaml
index f4a5f03..4c7f4bc 100644
--- a/charmed_openstack_info/data/lp-builder-config/misc.yaml
+++ b/charmed_openstack_info/data/lp-builder-config/misc.yaml
@@ -10,7 +10,7 @@ projects:
     branches:
       main:
         build-channels:
-          charmcraft: "2.x/stable"
+          charmcraft: "3.x/stable"
         channels:
           - latest/edge
         bases:
@@ -23,7 +23,7 @@ projects:
     branches:
       master:
         build-channels:
-          charmcraft: "3.x/beta"
+          charmcraft: "3.x/stable"
         channels:
           - latest/edge
         bases:
@@ -75,7 +75,7 @@ projects:
     branches:
       master:
         build-channels:
-          charmcraft: "3.x/beta"
+          charmcraft: "3.x/stable"
         channels:
           - latest/edge
         bases:
@@ -97,7 +97,7 @@ projects:
     branches:
       master:
         build-channels:
-          charmcraft: "3.x/beta"
+          charmcraft: "3.x/stable"
         channels:
           - latest/edge
         bases:
@@ -139,7 +139,7 @@ projects:
     branches:
       master:
         build-channels:
-          charmcraft: "3.x/beta"
+          charmcraft: "3.x/stable"
         channels:
           - latest/edge
         bases:
@@ -193,7 +193,7 @@ projects:
     branches:
       master:
         build-channels:
-          charmcraft: "3.x/beta"
+          charmcraft: "3.x/stable"
         channels:
           - latest/edge
         bases:
@@ -237,13 +237,11 @@ projects:
     branches:
       master:
         build-channels:
-          charmcraft: "2.x/stable"
+          charmcraft: "3.x/stable"
         channels:
           - latest/edge
         bases:
-          - "22.04"
-          - "23.04"
-          - "23.10"
+          - "24.04"
       stable/jammy:
         build-channels:
           charmcraft: "1.5/stable"
@@ -279,13 +277,11 @@ projects:
       master:
         enabled: True
         build-channels:
-          charmcraft: "2.x/stable"
+          charmcraft: "3.x/stable"
         channels:
           - latest/edge
         bases:
-          - "22.04"
-          - "23.04"
-          - "23.10"
+          - "24.04"
       stable/bionic:
         enabled: True
         build-channels:
diff --git a/charmed_openstack_info/data/lp-builder-config/openstack.yaml b/charmed_openstack_info/data/lp-builder-config/openstack.yaml
index b282e55..e26d214 100644
--- a/charmed_openstack_info/data/lp-builder-config/openstack.yaml
+++ b/charmed_openstack_info/data/lp-builder-config/openstack.yaml
@@ -4,7 +4,7 @@ defaults:
   branches:
     master:
       build-channels:
-        charmcraft: "3.x/beta"
+        charmcraft: "3.x/stable"
       channels:
         - latest/edge
       bases:
@@ -117,16 +117,11 @@ projects:
     branches:
       master:
         build-channels:
-          charmcraft: "2.x/candidate"
+          charmcraft: "3.x/stable"
         channels:
           - latest/edge
         bases:
-          - "16.04"
-          - "18.04"
-          - "20.04"
-          - "22.04"
-          - "23.04"
-          - "23.10"
+          - "24.04"
       stable/train:
         enabled: True
         build-channels:
@@ -228,16 +223,11 @@ projects:
       master:
         enabled: True
         build-channels:
-          charmcraft: "2.x/candidate"
+          charmcraft: "3.x/stable"
         channels:
           - latest/edge
         bases:
-          - "16.04"
-          - "18.04"
-          - "20.04"
-          - "22.04"
-          - "23.04"
-          - "23.10"
+          - "24.04"
       stable/train:
         enabled: True
         build-channels:
@@ -407,16 +397,11 @@ projects:
     branches:
       master:
         build-channels:
-          charmcraft: "2.x/candidate"
+          charmcraft: "3.x/stable"
         channels:
           - latest/edge
         bases:
-          - "16.04"
-          - "18.04"
-          - "20.04"
-          - "22.04"
-          - "23.04"
-          - "23.10"
+          - "24.04"
       stable/train:
         enabled: True
         build-channels:
@@ -524,7 +509,7 @@ projects:
     branches:
       master:
         build-channels:
-          charmcraft: "3.x/beta"
+          charmcraft: "3.x/stable"
         channels:
           - latest/edge
         bases:
@@ -650,16 +635,11 @@ projects:
     branches:
       master:
         build-channels:
-          charmcraft: "2.x/candidate"
+          charmcraft: "3.x/stable"
         channels:
           - latest/edge
         bases:
-          - "16.04"
-          - "18.04"
-          - "20.04"
-          - "22.04"
-          - "23.04"
-          - "23.10"
+          - "24.04"
       stable/train:
         enabled: False
         build-channels:
@@ -772,15 +752,11 @@ projects:
     branches:
       master:
         build-channels:
-          charmcraft: "2.x/candidate"
+          charmcraft: "3.x/stable"
         channels:
           - latest/edge
         bases:
-          - "18.04"
-          - "20.04"
-          - "22.04"
-          - "23.04"
-          - "23.10"
+          - "24.04"
       stable/train:
         enabled: True
         build-channels:
@@ -882,15 +858,11 @@ projects:
       master:
         enabled: True
         build-channels:
-          charmcraft: "2.x/candidate"
+          charmcraft: "3.x/stable"
         channels:
           - latest/edge
         bases:
-          - "18.04"
-          - "20.04"
-          - "22.04"
-          - "23.04"
-          - "23.10"
+          - "24.04"
       stable/train:
         enabled: True
         build-channels:
@@ -1005,14 +977,11 @@ projects:
       master:
         enabled: True
         build-channels:
-          charmcraft: "2.x/candidate"
+          charmcraft: "3.x/stable"
         channels:
           - latest/edge
         bases:
-          - "20.04"
-          - "22.04"
-          - "23.04"
-          - "23.10"
+          - "24.04"
       stable/ussuri:
         enabled: True
         build-channels:
@@ -1098,15 +1067,11 @@ projects:
       master:
         enabled: True
         build-channels:
-          charmcraft: "2.x/candidate"
+          charmcraft: "3.x/stable"
         channels:
           - latest/edge
         bases:
-          - "18.04"
-          - "20.04"
-          - "22.04"
-          - "23.04"
-          - "23.10"
+          - "24.04"
       stable/train:
         enabled: True
         build-channels:
@@ -1201,14 +1166,11 @@ projects:
       master:
         enabled: True
         build-channels:
-          charmcraft: "2.x/candidate"
+          charmcraft: "3.x/stable"
         channels:
           - latest/edge
         bases:
-          - "20.04"
-          - "22.04"
-          - "23.04"
-          - "23.10"
+          - "24.04"
       stable/ussuri:
         enabled: True
         build-channels:
@@ -1299,14 +1261,11 @@ projects:
       master:
         enabled: True
         build-channels:
-          charmcraft: "1.7/stable"
+          charmcraft: "3.x/stable"
         channels:
           - latest/edge
         bases:
-          - "20.04"
-          - "22.04"
-          - "23.04"
-          - "23.10"
+          - "24.04"
       stable/ussuri:
         enabled: True
         build-channels:
@@ -1392,15 +1351,11 @@ projects:
       master:
         enabled: True
         build-channels:
-          charmcraft: "2.x/candidate"
+          charmcraft: "3.x/stable"
         channels:
           - latest/edge
         bases:
-          - "18.04"
-          - "20.04"
-          - "22.04"
-          - "23.04"
-          - "23.10"
+          - "24.04"
       stable/train:
         enabled: True
         build-channels:
@@ -1495,15 +1450,11 @@ projects:
       master:
         enabled: True
         build-channels:
-          charmcraft: "2.x/candidate"
+          charmcraft: "3.x/stable"
         channels:
           - latest/edge
         bases:
-          - "18.04"
-          - "20.04"
-          - "22.04"
-          - "23.04"
-          - "23.10"
+          - "24.04"
       stable/train:
         enabled: True
         build-channels:
@@ -1597,13 +1548,11 @@ projects:
     branches:
       master:
         build-channels:
-          charmcraft: "2.x/candidate"
+          charmcraft: "3.x/stable"
         channels:
           - latest/edge
         bases:
-          - "22.04"
-          - "23.04"
-          - "23.10"
+          - "24.04"
       stable/ussuri:
         build-channels:
           charmcraft: "2.1/stable"
@@ -1689,13 +1638,11 @@ projects:
       master:
         enabled: True
         build-channels:
-          charmcraft: "2.x/candidate"
+          charmcraft: "3.x/stable"
         channels:
           - latest/edge
         bases:
-          - "22.04"
-          - "23.04"
-          - "23.10"
+          - "24.04"
       stable/zed:
         enabled: True
         build-channels:
@@ -1739,16 +1686,11 @@ projects:
     branches:
       master:
         build-channels:
-          charmcraft: "2.x/candidate"
+          charmcraft: "3.x/stable"
         channels:
           - latest/edge
         bases:
-          - "16.04"
-          - "18.04"
-          - "20.04"
-          - "22.04"
-          - "23.04"
-          - "23.10"
+          - "24.04"
       stable/train:
         enabled: True
         build-channels:
@@ -1844,14 +1786,11 @@ projects:
       master:
         enabled: True
         build-channels:
-          charmcraft: "2.x/candidate"
+          charmcraft: "3.x/stable"
         channels:
           - latest/edge
         bases:
-          - "20.04"
-          - "22.04"
-          - "23.04"
-          - "23.10"
+          - "24.04"
       stable/ussuri:
         enabled: True
         build-channels:
@@ -1937,14 +1876,11 @@ projects:
       master:
         enabled: True
         build-channels:
-          charmcraft: "2.x/candidate"
+          charmcraft: "3.x/stable"
         channels:
           - latest/edge
         bases:
-          - "20.04"
-          - "22.04"
-          - "23.04"
-          - "23.10"
+          - "24.04"
       stable/ussuri:
         enabled: True
         build-channels:
@@ -2035,14 +1971,11 @@ projects:
       master:
         enabled: True
         build-channels:
-          charmcraft: "2.x/candidate"
+          charmcraft: "3.x/stable"
         channels:
           - latest/edge
         bases:
-          - "20.04"
-          - "22.04"
-          - "23.04"
-          - "23.10"
+          - "24.04"
       stable/ussuri:
         enabled: True
         build-channels:
@@ -2133,15 +2066,11 @@ projects:
       master:
         enabled: True
         build-channels:
-          charmcraft: "2.x/candidate"
+          charmcraft: "3.x/stable"
         channels:
           - latest/edge
         bases:
-          - "18.04"
-          - "20.04"
-          - "22.04"
-          - "23.04"
-          - "23.10"
+          - "24.04"
       stable/train:
         enabled: True
         build-channels:
@@ -2236,7 +2165,7 @@ projects:
       master:
         enabled: True
         build-channels:
-          charmcraft: "3.x/beta"
+          charmcraft: "3.x/stable"
         channels:
           - latest/edge
         bases:
@@ -2326,13 +2255,11 @@ projects:
       master:
         enabled: True
         build-channels:
-          charmcraft: "2.x/candidate"
+          charmcraft: "3.x/stable"
         channels:
           - latest/edge
         bases:
-          - "22.04"
-          - "23.04"
-          - "23.10"
+          - "24.04"
       stable/2023.2:
         enabled: True
         build-channels:
@@ -2358,15 +2285,11 @@ projects:
     branches:
       master:
         build-channels:
-          charmcraft: "2.x/candidate"
+          charmcraft: "3.x/stable"
         channels:
           - latest/edge
         bases:
-          - "18.04"
-          - "20.04"
-          - "22.04"
-          - "23.04"
-          - "23.10"
+          - "24.04"
       stable/train:
         enabled: True
         build-channels:
@@ -2467,15 +2390,11 @@ projects:
     branches:
       master:
         build-channels:
-          charmcraft: "2.x/candidate"
+          charmcraft: "3.x/stable"
         channels:
           - latest/edge
         bases:
-          - "18.04"
-          - "20.04"
-          - "22.04"
-          - "23.04"
-          - "23.10"
+          - "24.04"
       stable/train:
         enabled: True
         build-channels:
@@ -2577,12 +2496,11 @@ projects:
       master:
         enabled: True
         build-channels:
-          charmcraft: "2.x/stable"
+          charmcraft: "3.x/stable"
         channels:
           - latest/edge
         bases:
-          - "22.04"
-          - "23.10"
+          - "24.04"
       stable/yoga:
         enabled: True
         build-channels:
@@ -2635,12 +2553,11 @@ projects:
       master:
         enabled: True
         build-channels:
-          charmcraft: "2.x/stable"
+          charmcraft: "3.x/stable"
         channels:
           - latest/edge
         bases:
-          - "22.04"
-          - "23.10"
+          - "24.04"
       stable/yoga:
         enabled: True
         build-channels:
diff --git a/charmed_openstack_info/data/lp-builder-config/ovn.yaml b/charmed_openstack_info/data/lp-builder-config/ovn.yaml
index d060b96..b799eef 100644
--- a/charmed_openstack_info/data/lp-builder-config/ovn.yaml
+++ b/charmed_openstack_info/data/lp-builder-config/ovn.yaml
@@ -4,7 +4,7 @@ defaults:
   branches:
     master:
       build-channels:
-        charmcraft: "3.x/beta"
+        charmcraft: "3.x/stable"
       channels:
         - latest/edge
       bases: