From: Greg Farnum Date: Fri, 24 Oct 2025 16:32:10 +0000 (+0000) Subject: cargo-cult some packaging updates for rocky X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fheads%2Fwip-greg-rocky;p=teuthology.git cargo-cult some packaging updates for rocky Signed-off-by: Greg Farnum --- diff --git a/teuthology/packaging.py b/teuthology/packaging.py index 2f6e6ba13..b4734d062 100644 --- a/teuthology/packaging.py +++ b/teuthology/packaging.py @@ -571,7 +571,7 @@ class GitbuilderProject(object): def _get_dist_release(self): version = self._parse_version(self.os_version) - if self.os_type in ('centos', 'rhel'): + if self.os_type in ('centos', 'rhel', 'rocky'): return "el{0}".format(version) elif self.os_type == "fedora": return "fc{0}".format(version) @@ -608,6 +608,8 @@ class GitbuilderProject(object): distro = "opensuse" elif distro == "sle": distro == "sle" + elif distro == "rocky": + distro = "rocky" else: # deb based systems use codename instead of a distro/version combo if not codename: @@ -941,6 +943,9 @@ class ShamanProject(GitbuilderProject): if distro in ('centos', 'rhel'): distro = 'centos' version = cls._parse_version(version) + if distro in ('rocky'): + distro = 'rocky' + version = cls._parse_version(version) return "%s/%s" % (distro, version) def _get_package_sha1(self):