From 1531a5f36144e9fef84904adb027fec2766dcba4 Mon Sep 17 00:00:00 2001 From: Nathan Cutler Date: Sat, 21 Jul 2018 18:01:46 +0200 Subject: [PATCH] orchestra/opsys: support openSUSE Leap Signed-off-by: Nathan Cutler --- teuthology/orchestra/opsys.py | 8 ++++++-- teuthology/orchestra/test/test_opsys.py | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/teuthology/orchestra/opsys.py b/teuthology/orchestra/opsys.py index 4c86fe64e4..c0e241686c 100644 --- a/teuthology/orchestra/opsys.py +++ b/teuthology/orchestra/opsys.py @@ -39,10 +39,14 @@ DISTRO_CODENAME_MAP = { "20": "heisenbug", }, "opensuse": { - "15.0": "leap", "42.2": "leap", "42.3": "leap", }, + "opensuse-leap": { + "42.2": "leap", + "42.3": "leap", + "15.0": "leap", + }, } DEFAULT_OS_VERSION = dict( @@ -67,7 +71,7 @@ class OS(object): __slots__ = ['name', 'version', 'codename', 'package_type'] _deb_distros = ('debian', 'ubuntu') - _rpm_distros = ('fedora', 'rhel', 'centos', 'opensuse') + _rpm_distros = ('fedora', 'rhel', 'centos', 'opensuse', 'opensuse-leap') def __init__(self, name=None, version=None, codename=None): self.name = name diff --git a/teuthology/orchestra/test/test_opsys.py b/teuthology/orchestra/test/test_opsys.py index 92692e3e1f..de8000d1e2 100644 --- a/teuthology/orchestra/test/test_opsys.py +++ b/teuthology/orchestra/test/test_opsys.py @@ -343,7 +343,7 @@ class TestOS(object): def test_opensuse_15_0_os_release(self): os = OS.from_os_release(self.str_opensuse_15_0_os_release) - assert os.name == 'opensuse' + assert os.name == 'opensuse-leap' assert os.version == '15.0' assert os.codename == 'leap' assert os.package_type == 'rpm' -- 2.39.5