Skip to content

Commit

Permalink
Revert "Removing bobcat from COU" (#566)
Browse files Browse the repository at this point in the history 
* Revert "Remove 2023.2 (bobcat) from COU (#541)"

This reverts commit d8c110d.

* Update docs.
  • Loading branch information
@chanchiwai-ray
chanchiwai-ray authored Oct 3, 2024
1 parent cda9801 commit b735fe9
Show file tree
Hide file tree
Showing 7 changed files with 71 additions and 39 deletions.
3 changes: 2 additions & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,8 @@ Charmed OpenStack Upgrader (cou) supports the following upgrades:
| Focal/Xena | Focal/Yoga |
| Jammy/Yoga | Jammy/Zed |
| Jammy/Zed | Jammy/Antelope |
| Jammy/Antelope | Jammy/Caracal |
| Jammy/Antelope | Jammy/Bobcat |
| Jammy/Bobcat | Jammy/Caracal |

# License
Charmed OpenStack Upgrader is a free software, distributed under the Apache-2.0 license. Refer to the
Expand Down
4 changes: 3 additions & 1 deletion cou/utils/openstack.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,7 @@
("yoga", "2022.1"),
("zed", "2022.2"),
("antelope", "2023.1"),
("bobcat", "2023.2"),
("caracal", "2024.1"),
]
)
Expand All @@ -153,6 +154,7 @@
"jammy": "yoga",
"kinetic": "zed",
"lunar": "antelope",
"mantic": "bobcat",
"noble": "caracal",
}

Expand All @@ -161,7 +163,7 @@
# https://docs.openstack.org/charm-guide/latest/project/charm-delivery.html
LTS_TO_OS_RELEASE = {
"focal": ["ussuri", "victoria", "wallaby", "xena", "yoga"],
"jammy": ["yoga", "zed", "antelope", "caracal"],
"jammy": ["yoga", "zed", "antelope", "bobcat", "caracal"],
}

# https://docs.ceph.com/en/latest/releases/
Expand Down
48 changes: 24 additions & 24 deletions cou/utils/openstack_lookup.csv
View file
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
service,ussuri-lower_version,ussuri-upper_version,victoria-lower_version,victoria-upper_version,wallaby-lower_version,wallaby-upper_version,xena-lower_version,xena-upper_version,yoga-lower_version,yoga-upper_version,zed-lower_version,zed-upper_version,antelope-lower_version,antelope-upper_version,caracal-lower_version,caracal-upper_version
aodh,10.0.0,11.0.0,11.0.0,12.0.0,12.0.0,13.0.0,13.0.0,14.0.0,14.0.0,15.0.0,15.0.0,16.0.0,16.0.0,17.0.0,18.0.0,19.0.0
barbican,10.0.0,11.0.0,11.0.0,12.0.0,12.0.0,13.0.0,13.0.0,14.0.0,14.0.0,15.0.0,15.0.0,16.0.0,16.0.0,17.0.0,18.0.0,19.0.0
ceilometer,14.0.0,15.0.0,15.0.0,16.0.0,16.0.0,17.0.0,17.0.0,18.0.0,18.0.0,19.0.0,19.0.0,20.0.0,20.0.0,21.0.0,22.0.0,23.0.0
cinder,16.0.0,17.0.0,17.0.0,18.0.0,18.0.0,19.0.0,19.0.0,20.0.0,20.0.0,21.0.0,21.0.0,22.0.0,22.0.0,23.0.0,24.0.0,25.0.0
designate,10.0.0,11.0.0,11.0.0,12.0.0,12.0.0,13.0.0,13.0.0,14.0.0,14.0.0,15.0.0,15.0.0,16.0.0,16.0.0,17.0.0,18.0.0,19.0.0
glance,20.0.0,21.0.0,21.0.0,22.0.0,22.0.0,23.0.0,23.0.0,24.0.0,24.0.0,25.0.0,25.0.0,26.0.0,26.0.0,27.0.0,28.0.0,29.0.0
heat,14.0.0,15.0.0,15.0.0,16.0.0,16.0.0,17.0.0,17.0.0,18.0.0,18.0.0,19.0.0,19.0.0,20.0.0,20.0.0,21.0.0,22.0.0,23.0.0
horizon,17.0.0,18.4.0,18.4.0,19.0.0,19.0.0,20.0.0,20.0.0,20.2.0,20.2.0,22.2.0,22.2.0,23.1.0,23.1.0,23.2.0,23.4.0,24.0.0
keystone,17.0.0,18.0.0,18.0.0,19.0.0,19.0.0,20.0.0,20.0.0,21.0.0,21.0.0,22.0.0,22.0.0,23.0.0,23.0.0,24.0.0,25.0.0,26.0.0
manila,10.0.0,11.0.0,11.0.0,12.0.0,12.0.0,13.0.0,13.0.0,14.0.0,14.0.0,15.0.0,15.0.0,16.0.0,16.0.0,17.0.0,18.0.0,19.0.0
masakari,9.0.0,10.0.0,10.0.0,11.0.0,11.0.0,12.0.0,12.0.0,13.0.0,13.0.0,14.0.0,14.0.0,15.0.0,15.0.0,16.0.0,17.0.0,18.0.0
neutron,16.0.0,17.0.0,17.0.0,18.0.0,18.0.0,19.0.0,19.0.0,20.0.0,20.0.0,21.0.0,21.0.0,22.0.0,22.0.0,23.0.0,24.0.0,25.0.0
nova,21.0.0,22.0.0,22.0.0,23.0.0,23.0.0,24.0.0,24.0.0,25.0.0,25.0.0,26.0.0,26.0.0,27.0.0,27.0.0,28.0.0,29.0.0,30.0.0
octavia,6.0.0,7.0.0,7.0.0,8.0.0,8.0.0,9.0.0,9.0.0,10.0.0,10.0.0,11.0.0,11.0.0,12.0.0,12.0.0,13.0.0,14.0.0,15.0.0
placement,3.0.0,4.0.0,4.0.0,5.0.0,5.0.0,6.0.0,6.0.0,7.0.0,7.0.0,8.0.0,8.0.0,9.0.0,9.0.0,10.0.0,11.0.0,12.0.0
swift,2.24.0,2.26.0,2.26.0,2.27.0,2.27.0,2.28.0,2.28.0,2.29.0,2.29.0,2.30.0,2.30.0,2.31.0,2.31.0,2.32.0,2.33.0,2.34.0
ceph,15.2.0,16.2.0,15.2.0,16.2.0,16.2.0,17.2.0,16.2.0,17.2.0,17.2.0,18.2.0,17.2.0,18.2.0,17.2.0,18.2.0,18.2.0,19.2.0
gnocchi,4.3.0,4.4.0,4.4.0,4.4.1,4.4.0,4.4.1,4.4.1,4.4.2,4.4.1,4.4.2,4.4.2,4.5.0,4.5.0,4.6.0,4.6.0,4.7.0
designate-bind,9.16.1,9.19.0,9.16.1,9.19.0,9.16.1,9.19.0,9.16.1,9.19.0,9.16.1,9.19.0,9.16.1,9.19.0,9.16.1,9.19.0,9.18.18,9.20.0
ovn,20.03,22.09,20.03,22.09,20.12,22.09,21.09,22.09,22.03,22.09,22.09,23.03,23.03,23.09,24.03,24.09
mysql,8,9,8,9,8,9,8,9,8,9,8,9,8,9,8,9
rabbitmq-server,3.8,3.9,3.8,3.9,3.8,3.9,3.8,3.9,3.8,3.10,3.9,3.10,3.9,3.10,3.9,3.10
vault,1.7,1.8,1.7,1.8,1.7,1.8,1.7,1.8,1.7,1.9,1.8,1.9,1.8,1.9,1.8,1.9
service,ussuri-lower_version,ussuri-upper_version,victoria-lower_version,victoria-upper_version,wallaby-lower_version,wallaby-upper_version,xena-lower_version,xena-upper_version,yoga-lower_version,yoga-upper_version,zed-lower_version,zed-upper_version,antelope-lower_version,antelope-upper_version,bobcat-lower_version,bobcat-upper_version,caracal-lower_version,caracal-upper_version
aodh,10.0.0,11.0.0,11.0.0,12.0.0,12.0.0,13.0.0,13.0.0,14.0.0,14.0.0,15.0.0,15.0.0,16.0.0,16.0.0,17.0.0,17.0.0,18.0.0,18.0.0,19.0.0
barbican,10.0.0,11.0.0,11.0.0,12.0.0,12.0.0,13.0.0,13.0.0,14.0.0,14.0.0,15.0.0,15.0.0,16.0.0,16.0.0,17.0.0,17.0.0,18.0.0,18.0.0,19.0.0
ceilometer,14.0.0,15.0.0,15.0.0,16.0.0,16.0.0,17.0.0,17.0.0,18.0.0,18.0.0,19.0.0,19.0.0,20.0.0,20.0.0,21.0.0,21.0.0,22.0.0,22.0.0,23.0.0
cinder,16.0.0,17.0.0,17.0.0,18.0.0,18.0.0,19.0.0,19.0.0,20.0.0,20.0.0,21.0.0,21.0.0,22.0.0,22.0.0,23.0.0,23.0.0,24.0.0,24.0.0,25.0.0
designate,10.0.0,11.0.0,11.0.0,12.0.0,12.0.0,13.0.0,13.0.0,14.0.0,14.0.0,15.0.0,15.0.0,16.0.0,16.0.0,17.0.0,17.0.0,18.0.0,18.0.0,19.0.0
glance,20.0.0,21.0.0,21.0.0,22.0.0,22.0.0,23.0.0,23.0.0,24.0.0,24.0.0,25.0.0,25.0.0,26.0.0,26.0.0,27.0.0,27.0.0,28.0.0,28.0.0,29.0.0
heat,14.0.0,15.0.0,15.0.0,16.0.0,16.0.0,17.0.0,17.0.0,18.0.0,18.0.0,19.0.0,19.0.0,20.0.0,20.0.0,21.0.0,21.0.0,22.0.0,22.0.0,23.0.0
horizon,17.0.0,18.4.0,18.4.0,19.0.0,19.0.0,20.0.0,20.0.0,20.2.0,20.2.0,22.2.0,22.2.0,23.1.0,23.1.0,23.2.0,23.2.0,23.4.0,23.4.0,24.0.0
keystone,17.0.0,18.0.0,18.0.0,19.0.0,19.0.0,20.0.0,20.0.0,21.0.0,21.0.0,22.0.0,22.0.0,23.0.0,23.0.0,24.0.0,24.0.0,25.0.0,25.0.0,26.0.0
manila,10.0.0,11.0.0,11.0.0,12.0.0,12.0.0,13.0.0,13.0.0,14.0.0,14.0.0,15.0.0,15.0.0,16.0.0,16.0.0,17.0.0,17.0.0,18.0.0,18.0.0,19.0.0
masakari,9.0.0,10.0.0,10.0.0,11.0.0,11.0.0,12.0.0,12.0.0,13.0.0,13.0.0,14.0.0,14.0.0,15.0.0,15.0.0,16.0.0,16.0.0,17.0.0,17.0.0,18.0.0
neutron,16.0.0,17.0.0,17.0.0,18.0.0,18.0.0,19.0.0,19.0.0,20.0.0,20.0.0,21.0.0,21.0.0,22.0.0,22.0.0,23.0.0,23.0.0,24.0.0,24.0.0,25.0.0
nova,21.0.0,22.0.0,22.0.0,23.0.0,23.0.0,24.0.0,24.0.0,25.0.0,25.0.0,26.0.0,26.0.0,27.0.0,27.0.0,28.0.0,28.0.0,29.0.0,29.0.0,30.0.0
octavia,6.0.0,7.0.0,7.0.0,8.0.0,8.0.0,9.0.0,9.0.0,10.0.0,10.0.0,11.0.0,11.0.0,12.0.0,12.0.0,13.0.0,13.0.0,14.0.0,14.0.0,15.0.0
placement,3.0.0,4.0.0,4.0.0,5.0.0,5.0.0,6.0.0,6.0.0,7.0.0,7.0.0,8.0.0,8.0.0,9.0.0,9.0.0,10.0.0,10.0.0,11.0.0,11.0.0,12.0.0
swift,2.24.0,2.26.0,2.26.0,2.27.0,2.27.0,2.28.0,2.28.0,2.29.0,2.29.0,2.30.0,2.30.0,2.31.0,2.31.0,2.32.0,2.32.0,2.33.0,2.33.0,2.34.0
ceph,15.2.0,16.2.0,15.2.0,16.2.0,16.2.0,17.2.0,16.2.0,17.2.0,17.2.0,18.2.0,17.2.0,18.2.0,17.2.0,18.2.0,18.2.0,19.2.0,18.2.0,19.2.0
gnocchi,4.3.0,4.4.0,4.4.0,4.4.1,4.4.0,4.4.1,4.4.1,4.4.2,4.4.1,4.4.2,4.4.2,4.5.0,4.5.0,4.6.0,4.6.0,4.6.1,4.6.0,4.7.0
designate-bind,9.16.1,9.19.0,9.16.1,9.19.0,9.16.1,9.19.0,9.16.1,9.19.0,9.16.1,9.19.0,9.16.1,9.19.0,9.16.1,9.19.0,9.16.1,9.19.0,9.18.18,9.20.0
ovn,20.03,22.09,20.03,22.09,20.12,22.09,21.09,22.09,22.03,22.09,22.09,23.03,23.03,23.09,23.09,24.03,24.03,24.09
mysql,8,9,8,9,8,9,8,9,8,9,8,9,8,9,8,9,8,9
rabbitmq-server,3.8,3.9,3.8,3.9,3.8,3.9,3.8,3.9,3.8,3.10,3.9,3.10,3.9,3.10,3.9,3.10,3.9,3.10
vault,1.7,1.8,1.7,1.8,1.7,1.8,1.7,1.8,1.7,1.9,1.8,1.9,1.8,1.9,1.8,1.9,1.8,1.9
14 changes: 14 additions & 0 deletions cou/utils/openstack_to_track_mapping.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ ceph-mon,focal,yoga,quincy
ceph-mon,jammy,yoga,quincy
ceph-mon,jammy,zed,quincy
ceph-mon,jammy,2023.1,quincy
ceph-mon,jammy,2023.2,reef
ceph-mon,jammy,2024.1,squid
ceph-fs,focal,ussuri,octopus
ceph-fs,focal,victoria,octopus
Expand All @@ -16,6 +17,7 @@ ceph-fs,focal,yoga,quincy
ceph-fs,jammy,yoga,quincy
ceph-fs,jammy,zed,quincy
ceph-fs,jammy,2023.1,quincy
ceph-fs,jammy,2023.2,reef
ceph-fs,jammy,2024.1,squid
ceph-radosgw,focal,ussuri,octopus
ceph-radosgw,focal,victoria,octopus
Expand All @@ -25,6 +27,7 @@ ceph-radosgw,focal,yoga,quincy
ceph-radosgw,jammy,yoga,quincy
ceph-radosgw,jammy,zed,quincy
ceph-radosgw,jammy,2023.1,quincy
ceph-radosgw,jammy,2023.2,reef
ceph-radosgw,jammy,2024.1,squid
ceph-osd,focal,ussuri,octopus
ceph-osd,focal,victoria,octopus
Expand All @@ -34,6 +37,7 @@ ceph-osd,focal,yoga,quincy
ceph-osd,jammy,yoga,quincy
ceph-osd,jammy,zed,quincy
ceph-osd,jammy,2023.1,quincy
ceph-osd,jammy,2023.2,reef
ceph-osd,jammy,2024.1,squid
ceph-dashboard,focal,ussuri,octopus
ceph-dashboard,focal,victoria,octopus
Expand All @@ -43,6 +47,7 @@ ceph-dashboard,focal,yoga,quincy
ceph-dashboard,jammy,yoga,quincy
ceph-dashboard,jammy,zed,quincy
ceph-dashboard,jammy,2023.1,quincy
ceph-dashboard,jammy,2023.2,reef
ceph-dashboard,jammy,2024.1,squid
ovn-chassis,focal,ussuri,20.03
ovn-chassis,focal,ussuri,22.03
Expand All @@ -56,6 +61,7 @@ ovn-chassis,focal,yoga,22.03
ovn-chassis,jammy,yoga,22.03
ovn-chassis,jammy,zed,22.09
ovn-chassis,jammy,2023.1,23.03
ovn-chassis,jammy,2023.2,23.09
ovn-chassis,jammy,2024.1,24.03
ovn-dedicated-chassis,focal,ussuri,20.03
ovn-dedicated-chassis,focal,ussuri,22.03
Expand All @@ -69,6 +75,7 @@ ovn-dedicated-chassis,focal,yoga,22.03
ovn-dedicated-chassis,jammy,yoga,22.03
ovn-dedicated-chassis,jammy,zed,22.09
ovn-dedicated-chassis,jammy,2023.1,23.03
ovn-dedicated-chassis,jammy,2023.2,23.09
ovn-dedicated-chassis,jammy,2024.1,24.03
ovn-central,focal,ussuri,20.03
ovn-central,focal,ussuri,22.03
Expand All @@ -82,6 +89,7 @@ ovn-central,focal,yoga,22.03
ovn-central,jammy,yoga,22.03
ovn-central,jammy,zed,22.09
ovn-central,jammy,2023.1,23.03
ovn-central,jammy,2023.2,23.09
ovn-central,jammy,2024.1,24.03
mysql-innodb-cluster,focal,ussuri,8.0
mysql-innodb-cluster,focal,victoria,8.0
Expand All @@ -91,6 +99,7 @@ mysql-innodb-cluster,focal,yoga,8.0
mysql-innodb-cluster,jammy,yoga,8.0
mysql-innodb-cluster,jammy,zed,8.0
mysql-innodb-cluster,jammy,2023.1,8.0
mysql-innodb-cluster,jammy,2023.2,8.0
mysql-innodb-cluster,jammy,2024.1,8.0
mysql-router,focal,ussuri,8.0
mysql-router,focal,victoria,8.0
Expand All @@ -100,6 +109,7 @@ mysql-router,focal,yoga,8.0
mysql-router,jammy,yoga,8.0
mysql-router,jammy,zed,8.0
mysql-router,jammy,2023.1,8.0
mysql-router,jammy,2023.2,8.0
mysql-router,jammy,2024.1,8.0
hacluster,focal,ussuri,2.0.3
hacluster,focal,ussuri,2.4
Expand All @@ -114,6 +124,7 @@ hacluster,focal,yoga,2.4
hacluster,jammy,yoga,2.4
hacluster,jammy,zed,2.4
hacluster,jammy,2023.1,2.4
hacluster,jammy,2023.2,2.4
hacluster,jammy,2024.1,2.4
pacemaker-remote,focal,ussuri,focal
pacemaker-remote,focal,victoria,focal
Expand All @@ -123,6 +134,7 @@ pacemaker-remote,focal,yoga,focal
pacemaker-remote,jammy,yoga,jammy
pacemaker-remote,jammy,zed,jammy
pacemaker-remote,jammy,2023.1,jammy
pacemaker-remote,jammy,2023.2,jammy
pacemaker-remote,jammy,2024.1,jammy
rabbitmq-server,focal,ussuri,3.8
rabbitmq-server,focal,ussuri,3.9
Expand All @@ -137,6 +149,7 @@ rabbitmq-server,focal,yoga,3.9
rabbitmq-server,jammy,yoga,3.9
rabbitmq-server,jammy,zed,3.9
rabbitmq-server,jammy,2023.1,3.9
rabbitmq-server,jammy,2023.2,3.9
rabbitmq-server,jammy,2024.1,3.9
vault,focal,ussuri,1.7
vault,focal,victoria,1.7
Expand All @@ -147,4 +160,5 @@ vault,jammy,yoga,1.7
vault,jammy,yoga,1.8
vault,jammy,zed,1.8
vault,jammy,2023.1,1.8
vault,jammy,2023.2,1.8
vault,jammy,2024.1,1.8
8 changes: 2 additions & 6 deletions docs/index.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,6 @@ running cloud and proposes an upgrade plan to the next available OpenStack relea
**COU** follows the steps defined in the `charm-guide`_ upgrades overview, and
it supports the upgrades for the following OpenStack releases:

.. Warning::

Skip-Level-Upgrade (SLURP) Releases, such as Jammy/Bobcat, are not
supported in **COU**.

============== ==============
From To
============== ==============
Expand All @@ -23,7 +18,8 @@ Focal/Wallaby Focal/Xena
Focal/Xena Focal/Yoga
Jammy/Yoga Jammy/Zed
Jammy/Zed Jammy/Antelope
Jammy/Antelope Jammy/Caracal
Jammy/Antelope Jammy/Bobcat
Jammy/Bobcat Jammy/Caracal
============== ==============

Source code available on `Github`_.
Expand Down
3 changes: 2 additions & 1 deletion tests/unit/steps/test_plan.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -664,7 +664,8 @@ def test_is_control_plane_upgraded(
(OpenStackRelease("xena"), "focal", "yoga"),
(OpenStackRelease("yoga"), "jammy", "zed"),
(OpenStackRelease("zed"), "jammy", "antelope"),
(OpenStackRelease("antelope"), "jammy", "caracal"),
(OpenStackRelease("antelope"), "jammy", "bobcat"),
(OpenStackRelease("bobcat"), "jammy", "caracal"),
],
)
def test_determine_upgrade_target(o7k_release, current_series, next_release):
Expand Down
Loading

0 comments on commit b735fe9

Please sign in to comment.