Skip to content

Commit

Permalink
Sync/rebuild for Dalmatian/Epoxy updates
Browse files Browse the repository at this point in the history
Refresh and rebuild charm for awareness of Dalmatian and Epoxy
Cloud Archive releases.

Change-Id: If82f83c097dbcef5232f345a915a8a3f62ed4da6
  • Loading branch information
javacruft committed Nov 15, 2024
1 parent 04a12ec commit 2030423
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 1 deletion.
2 changes: 2 additions & 0 deletions charmhelpers/contrib/openstack/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 4 additions & 1 deletion charmhelpers/core/hookenv.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,10 @@
# Charm Helpers Developers <[email protected]>

import copy
from distutils.version import LooseVersion
try:
from distutils.version import LooseVersion
except ImportError:
from looseversion import LooseVersion
from enum import Enum
from functools import wraps
from collections import namedtuple, UserDict
Expand Down
20 changes: 20 additions & 0 deletions charmhelpers/fetch/ubuntu.py
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down Expand Up @@ -288,6 +304,8 @@
'antelope',
'bobcat',
'caracal',
'dalmatian',
'epoxy',
)


Expand Down Expand Up @@ -318,6 +336,8 @@
('lunar', 'antelope'),
('mantic', 'bobcat'),
('noble', 'caracal'),
('oracular', 'dalmatian'),
('plucky', 'epoxy'),
])


Expand Down

0 comments on commit 2030423

Please sign in to comment.