From 70155258bc6b2371a91c77aaedd200984de3aca9 Mon Sep 17 00:00:00 2001
From: Billy Olsen <billy.olsen@canonical.com>
Date: Fri, 21 Jun 2024 20:53:24 -0700
Subject: [PATCH] Use charmcraft 3 for some charms

Some charms are being migrated to charmcraft 3 on the master branch.
Update the launchpad recipe information to reflect this.

Signed-off-by: Billy Olsen <billy.olsen@canonical.com>
---
 .../data/lp-builder-config/misc.yaml          | 34 ++++++-------------
 .../data/lp-builder-config/openstack.yaml     | 17 +++-------
 .../data/lp-builder-config/ovn.yaml           |  6 ++--
 3 files changed, 16 insertions(+), 41 deletions(-)

diff --git a/charmed_openstack_info/data/lp-builder-config/misc.yaml b/charmed_openstack_info/data/lp-builder-config/misc.yaml
index fee585f..70a9e20 100644
--- a/charmed_openstack_info/data/lp-builder-config/misc.yaml
+++ b/charmed_openstack_info/data/lp-builder-config/misc.yaml
@@ -23,14 +23,11 @@ projects:
     branches:
       master:
         build-channels:
-          charmcraft: "2.x/stable"
+          charmcraft: "3.x/beta"
         channels:
           - latest/edge
         bases:
-          - "20.04"
-          - "22.04"
-          - "23.04"
-          - "23.10"
+          - "24.04"
       stable/jammy:
         build-channels:
           charmcraft: "1.5/stable"
@@ -73,14 +70,11 @@ projects:
     branches:
       master:
         build-channels:
-          charmcraft: "2.x/stable"
+          charmcraft: "3.x/beta"
         channels:
           - latest/edge
         bases:
-          - "22.04"
-          - "22.10"
-          - "23.04"
-          - "23.10"
+          - "24.04"
       #stable/8.0:
       stable/jammy:
         build-channels:
@@ -98,14 +92,11 @@ projects:
     branches:
       master:
         build-channels:
-          charmcraft: "2.x/stable"
+          charmcraft: "3.x/beta"
         channels:
           - latest/edge
         bases:
-          - "22.04"
-          - "22.10"
-          - "23.04"
-          - "23.10"
+          - "24.04"
       #stable/8.0:
       stable/jammy:
         build-channels:
@@ -143,14 +134,11 @@ projects:
     branches:
       master:
         build-channels:
-          charmcraft: "2.x/stable"
+          charmcraft: "3.x/beta"
         channels:
           - latest/edge
         bases:
-          - "20.04"
-          - "22.04"
-          - "23.04"
-          - "23.10"
+          - "24.04"
       # jammy
       #stable/3.9:
       stable/jammy:
@@ -200,13 +188,11 @@ projects:
     branches:
       master:
         build-channels:
-          charmcraft: "2.x/stable"
+          charmcraft: "3.x/beta"
         channels:
           - latest/edge
         bases:
-          - "22.04"
-          - "23.04"
-          - "23.10"
+          - "24.04"
       stable/1.8:
         build-channels:
           charmcraft: "2.1/stable"
diff --git a/charmed_openstack_info/data/lp-builder-config/openstack.yaml b/charmed_openstack_info/data/lp-builder-config/openstack.yaml
index f687610..6bc138e 100644
--- a/charmed_openstack_info/data/lp-builder-config/openstack.yaml
+++ b/charmed_openstack_info/data/lp-builder-config/openstack.yaml
@@ -4,16 +4,11 @@ defaults:
   branches:
     master:
       build-channels:
-        charmcraft: "2.x/candidate"
+        charmcraft: "3.x/beta"
       channels:
         - latest/edge
       bases:
-        - "16.04"
-        - "18.04"
-        - "20.04"
-        - "22.04"
-        - "23.04"
-        - "23.10"
+        - "24.04"
     stable/train:
       enabled: True
       build-channels:
@@ -2157,15 +2152,11 @@ projects:
       master:
         enabled: True
         build-channels:
-          charmcraft: "2.x/candidate"
+          charmcraft: "3.x/beta"
         channels:
           - latest/edge
         bases:
-          - "20.04"
-          - "22.04"
-          - "22.10"
-          - "23.04"
-          - "23.10"
+          - "24.04"
       stable/ussuri:
         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 e7adee5..d060b96 100644
--- a/charmed_openstack_info/data/lp-builder-config/ovn.yaml
+++ b/charmed_openstack_info/data/lp-builder-config/ovn.yaml
@@ -4,13 +4,11 @@ defaults:
   branches:
     master:
       build-channels:
-        charmcraft: "2.x/candidate"
+        charmcraft: "3.x/beta"
       channels:
         - latest/edge
       bases:
-        - "22.04"
-        - "23.04"
-        - "23.10"
+        - "24.04"
     stable/20.03:
       build-channels:
         charmcraft: "1.5/stable"