From 8e819a23154da766462de8d4182272b7e9aa0493 Mon Sep 17 00:00:00 2001 From: Kyr Shatskyy Date: Wed, 5 Feb 2025 18:28:32 +0100 Subject: [PATCH 1/4] orchestra/opsys: add 'rocky' to DISTRO_CODENAME_MAP Signed-off-by: Kyr Shatskyy --- teuthology/orchestra/opsys.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/teuthology/orchestra/opsys.py b/teuthology/orchestra/opsys.py index 82b468f40..73c928a41 100644 --- a/teuthology/orchestra/opsys.py +++ b/teuthology/orchestra/opsys.py @@ -34,6 +34,10 @@ "7": "maipo", "6": "santiago", }, + "rocky": { + "8.10": "rocky", + "9.5": "rocky", + }, "centos": { "10": "stream", "9": "stream", From 0d9320e780570203b750294a9eabd626846090ec Mon Sep 17 00:00:00 2001 From: Kyr Shatskyy Date: Tue, 11 Feb 2025 15:47:56 +0100 Subject: [PATCH 2/4] orchestra/opsys: add almalinux versions Signed-off-by: Kyr Shatskyy --- teuthology/orchestra/opsys.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/teuthology/orchestra/opsys.py b/teuthology/orchestra/opsys.py index 73c928a41..04d01e766 100644 --- a/teuthology/orchestra/opsys.py +++ b/teuthology/orchestra/opsys.py @@ -34,6 +34,10 @@ "7": "maipo", "6": "santiago", }, + "alma": { + "8.10": "alma", + "9.5": "alma", + }, "rocky": { "8.10": "rocky", "9.5": "rocky", @@ -191,6 +195,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 From 851c6a8afd0d6106776f79c4c62b17d4003791e4 Mon Sep 17 00:00:00 2001 From: Kyr Shatskyy Date: Wed, 19 Feb 2025 23:50:39 +0100 Subject: [PATCH 3/4] orchestra/opsys: add 'alma' and 'rocky' to default os map Signed-off-by: Kyr Shatskyy --- teuthology/orchestra/opsys.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/teuthology/orchestra/opsys.py b/teuthology/orchestra/opsys.py index 04d01e766..8f72f888e 100644 --- a/teuthology/orchestra/opsys.py +++ b/teuthology/orchestra/opsys.py @@ -90,6 +90,8 @@ opensuse="15.4", sle="15.2", rhel="8.6", + rocky="9.5", + alma="9.5", debian='8.0' ) From b54779b3260028a9e8fbb7f108d8537fd09c7ad7 Mon Sep 17 00:00:00 2001 From: Kyrylo Shatskyy Date: Wed, 26 Feb 2025 19:42:05 +0100 Subject: [PATCH 4/4] orchestra/opsys: add tumbleweed version to the distro version map openSUSE Tumbleweed is a rolling release, so it has fixed version number and changable version id is represented by a date of snapshot, example of vm image: openSUSE-Tumbleweed-Minimal-VM.x86_64-1.0.0-Cloud-Snapshot20250224.qcow2 In comparison, openSUSE Leap has regular release, incremental version, for example: 15.0, 15.1, ..., 15.6, etc., and recently introduced 16.0 alpha. Because there is no sense to stick to the date, it is changing almost daily, it is suggested to fix Tumbleweed version to 1.0 to distinguish from Leap. As a side effect, once Teuthology locks a node with imaged Tumbleweed it updates os version correctly to date of release in paddles, and pulpito display it interface correspondingly as the date. Signed-off-by: Kyrylo Shatskyy --- teuthology/orchestra/opsys.py | 1 + 1 file changed, 1 insertion(+) diff --git a/teuthology/orchestra/opsys.py b/teuthology/orchestra/opsys.py index 8f72f888e..b94f0d76a 100644 --- a/teuthology/orchestra/opsys.py +++ b/teuthology/orchestra/opsys.py @@ -61,6 +61,7 @@ "20": "heisenbug", }, "opensuse": { + "1.0": "tumbleweed", "15.0": "leap", "15.1": "leap", "15.2": "leap",