Skip to content

Commit 180450e

Browse files
authored
Merge pull request canonical#296 from rodrigogansobarbieri/oracular
Add oracular/dalmatian support
2 parents c20ff94 + 2bf415e commit 180450e

3 files changed

Lines changed: 24 additions & 7 deletions

File tree

common/ch_channel_map/any_series

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,15 @@ declare -A RELNAME_MAP=(
33
[antelope]=2023.1
44
[bobcat]=2023.2
55
[caracal]=2024.1
6+
[dalmatian]=latest
7+
[epoxy]=latest
68
)
79
for c in ${OST_CHARMS[@]}; do
810
CHARM_CHANNEL[$c]=${RELNAME_MAP[$release]:-$release}/edge
11+
# use latest/edge when on noble but not jammy-caracal
12+
if [[ $series = noble ]]; then
13+
CHARM_CHANNEL[$c]=latest/edge
14+
fi
915
done
1016

1117
for c in ${CEPH_CHARMS[@]}; do

common/ch_channel_map/oracular

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
noble

common/openstack_release_info

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,26 @@ declare -A lts=( [trusty]=icehouse
2424
[jammy]=yoga
2525
[noble]=caracal
2626
)
27+
28+
# These hardcoded sorted lists replace the previous "sorted" lists
29+
# because we cannot sort when the alphabet wraps around.
30+
declare -a lts_releases_sorted=( caracal
31+
yoga
32+
ussuri
33+
queens
34+
mitaka
35+
icehouse
36+
)
37+
2738
declare -A nonlts=( [hirsute]=wallaby
2839
[impish]=xena
2940
[kinetic]=zed
3041
[lunar]=antelope
3142
[mantic]=bobcat
43+
[oracular]=dalmatian
44+
[plucky]=epoxy
3245
)
46+
3347
# NOTE: must be kept up-to-date with ALL versions of openstack.
3448
declare -A os_releases=( [icehouse]=0
3549
[juno]=1
@@ -52,7 +66,10 @@ declare -A os_releases=( [icehouse]=0
5266
[antelope]=18
5367
[bobcat]=19
5468
[caracal]=20
69+
[dalmatian]=21
70+
[epoxy]=22
5571
)
72+
5673
# Reverse lookups (revision to series)
5774
declare -A lts_rev=()
5875
for s in ${!lts[@]}; do
@@ -63,10 +80,3 @@ for s in ${!nonlts[@]}; do
6380
nonlts_rev[${nonlts[$s]}]=$s
6481
done
6582

66-
# Alphabetically sorted arrays of release names
67-
readarray -t lts_releases_sorted<<<\
68-
"`echo -n ${lts[@]}| tr ' ' '\n' | sort -r`"
69-
readarray -t nonlts_releases_sorted<<<\
70-
"`echo -n ${nonlts[@]}| tr ' ' '\n' | sort -r`"
71-
readarray -t all_releases_sorted<<<"\
72-
`{ echo -n ${lts[@]}; echo " ${nonlts[@]}"; }| tr ' ' '\n'| sort -r`"

0 commit comments

Comments
 (0)