From 5ee31599cf4d1b819a9d9e42a74ac316598ddfa7 Mon Sep 17 00:00:00 2001
From: James Page <james.page@canonical.com>
Date: Wed, 6 Nov 2024 11:19:22 +0000
Subject: [PATCH] openstack: add new releases.

Add Dalmatian and Epoxy release metadata.
---
 charmhelpers/contrib/openstack/utils.py |  2 ++
 charmhelpers/fetch/ubuntu.py            | 20 ++++++++++++++++++++
 2 files changed, 22 insertions(+)

diff --git a/charmhelpers/contrib/openstack/utils.py b/charmhelpers/contrib/openstack/utils.py
index 82c28d8ea..ac52d797b 100644
--- a/charmhelpers/contrib/openstack/utils.py
+++ b/charmhelpers/contrib/openstack/utils.py
@@ -162,6 +162,8 @@
     ('2023.1', 'antelope'),
     ('2023.2', 'bobcat'),
     ('2024.1', 'caracal'),
+    ('2024.2', 'dalmatian'),
+    ('2025.1', 'epoxy'),
 ])
 
 # The ugly duckling - must list releases oldest to newest
diff --git a/charmhelpers/fetch/ubuntu.py b/charmhelpers/fetch/ubuntu.py
index d0089eb7f..fdcad025e 100644
--- a/charmhelpers/fetch/ubuntu.py
+++ b/charmhelpers/fetch/ubuntu.py
@@ -254,6 +254,22 @@
     'caracal/proposed': 'jammy-proposed/caracal',
     'jammy-caracal/proposed': 'jammy-proposed/caracal',
     'jammy-proposed/caracal': 'jammy-proposed/caracal',
+    # dalmatian
+    'dalmatian': 'noble-updates/dalmatian',
+    'noble-dalmatian': 'noble-updates/dalmatian',
+    'noble-dalmatian/updates': 'noble-updates/dalmatian',
+    'noble-updates/dalmatian': 'noble-updates/dalmatian',
+    'dalmatian/proposed': 'noble-proposed/dalmatian',
+    'noble-dalmatian/proposed': 'noble-proposed/dalmatian',
+    'noble-proposed/dalmatian': 'noble-proposed/dalmatian',
+    # epoxy
+    'epoxy': 'noble-updates/epoxy',
+    'noble-epoxy': 'noble-updates/epoxy',
+    'noble-epoxy/updates': 'noble-updates/epoxy',
+    'noble-updates/epoxy': 'noble-updates/epoxy',
+    'epoxy/proposed': 'noble-proposed/epoxy',
+    'noble-epoxy/proposed': 'noble-proposed/epoxy',
+    'noble-proposed/epoxy': 'noble-proposed/epoxy',
 
     # OVN
     'focal-ovn-22.03': 'focal-updates/ovn-22.03',
@@ -288,6 +304,8 @@
     'antelope',
     'bobcat',
     'caracal',
+    'dalmatian',
+    'epoxy',
 )
 
 
@@ -318,6 +336,8 @@
     ('lunar', 'antelope'),
     ('mantic', 'bobcat'),
     ('noble', 'caracal'),
+    ('oracular', 'dalmatian'),
+    ('plucky', 'epoxy'),
 ])