opsys/maas: Normalize MaaS distro/version combos

Signed-off-by: David Galloway <david.galloway@ibm.com>

diff --git a/teuthology/orchestra/opsys.py b/teuthology/orchestra/opsys.py
index 1c0ad86caaf74dd74b9c93c63c9c409d2a4bd886..addda3bea06ab113e667406bde0a33548eb12c43 100644 (file)
--- a/teuthology/orchestra/opsys.py
+++ b/teuthology/orchestra/opsys.py
@@ -131,6 +131,12 @@ class OS(object):
 
     @staticmethod
     def _codename_to_version(name, codename):
+        # Handle MaaS-style CentOS Stream identifiers
+        if name == "centos":
+            m = re.match(r"^centos(\d+)-stream$", str(codename).lower())
+            if m:
+                return m.group(1)
+
         for (version, _codename) in DISTRO_CODENAME_MAP[name].items():
             if codename == _codename:
                 return version

diff --git a/teuthology/provision/maas.py b/teuthology/provision/maas.py
index c675e9ee452a52522545fdc8f5deca0ada35d53f..d2b3ed2efa5a6943a8cabd10a7ecf2e8e6a561ca 100644 (file)
--- a/teuthology/provision/maas.py
+++ b/teuthology/provision/maas.py
@@ -2,6 +2,7 @@ import io
 import json
 import logging
 import operator
+import re
 
 from oauthlib.oauth1 import SIGNATURE_PLAINTEXT
 from requests import Response
@@ -108,6 +109,16 @@ class MAAS(object):
 
         self.os_type, self.os_version = os_type, os_version
 
+        # Normalize CentOS Stream version inputs early (keep internal form as "<N>.stream")
+        if self.os_type == "centos" and self.os_version:
+            v = str(self.os_version).lower().strip()
+            m = re.match(r"^centos(\d+)-stream$", v)
+            if m:
+                self.os_version = f"{m.group(1)}.stream"
+            elif re.match(r"^\d+$", v):
+                self.os_version = f"{v}.stream"
+            # if already like "9.stream", leave it as-is
+
     def _get_system_info(self) -> Tuple[Optional[str], Optional[str], str, str]:
         """Get the system info for the deployed machine
 
@@ -122,9 +133,21 @@ class MAAS(object):
 
         if status_name in ["deployed", "allocated"]:
             os_type = machine.get("osystem", "").lower()
-            os_version = OS._codename_to_version(
-                os_type, machine.get("distro_series")
-            )
+            distro_series = (machine.get("distro_series") or "").lower()
+
+            # MAAS uses series strings for some distros (e.g. centos9-stream),
+            # but OS._codename_to_version() expects codenames ("stream", "core").
+            if os_type == "centos":
+                m = re.match(r"^centos(\d+)-stream$", distro_series)
+                if m:
+                    # normalize to what teuth CLI wants to accept: 9.stream
+                    os_version = f"{m.group(1)}.stream"
+                else:
+                    # fall back to existing mapping (covers core/stream)
+                    os_version = OS._codename_to_version(os_type, distro_series)
+            else:
+                os_version = OS._codename_to_version(os_type, distro_series)
+
             return os_type, os_version, arch, machine.get("system_id")
 
         raise RuntimeError(