Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

opsys: add AlmaLinux and RockyLinux and Tumbleweed to distro codename map #2027

Merged
merged 4 commits into from
Feb 26, 2025
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions teuthology/orchestra/opsys.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,14 @@
"7": "maipo",
"6": "santiago",
},
"alma": {
"8.10": "alma",
"9.5": "alma",
},
"rocky": {
"8.10": "rocky",
"9.5": "rocky",
},
"centos": {
"10": "stream",
"9": "stream",
Expand All @@ -53,6 +61,7 @@
"20": "heisenbug",
},
"opensuse": {
"1.0": "tumbleweed",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this an intentional change? (since this PR is for alma and rocky?)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no worth of effort to split this off

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

however, I've just split this change off to another commit

"15.0": "leap",
"15.1": "leap",
"15.2": "leap",
Expand Down Expand Up @@ -82,6 +91,8 @@
opensuse="15.4",
sle="15.2",
rhel="8.6",
rocky="9.5",
alma="9.5",
debian='8.0'
)

Expand Down Expand Up @@ -187,6 +198,8 @@ def from_os_release(cls, os_release_str):
elif name == 'centos':
if parse_version(version) >= Version("8.0"):
version = f"{version}.stream"
elif name == 'almalinux':
name = 'alma'
obj = cls(name=name, version=version)
return obj

Expand Down
Loading