Use actual latest version of OS in os version check (#6067)

Author: mdegat01

supervisor/const.py

@@ -197,6 +197,7 @@
 ATTR_HASSIO_API = "hassio_api"
 ATTR_HASSIO_ROLE = "hassio_role"
 ATTR_HASSOS = "hassos"
+ATTR_HASSOS_UNRESTRICTED = "hassos_unrestricted"
 ATTR_HEALTHY = "healthy"
 ATTR_HEARTBEAT_LED = "heartbeat_led"
 ATTR_HOMEASSISTANT = "homeassistant"

supervisor/os/manager.py

@@ -110,6 +110,11 @@ def latest_version(self) -> AwesomeVersion | None:
         """Return version of HassOS."""
         return self.sys_updater.version_hassos
 
+    @property
+    def latest_version_unrestricted(self) -> AwesomeVersion | None:
+        """Return current latest version of HassOS for board ignoring upgrade restrictions."""
+        return self.sys_updater.version_hassos_unrestricted
+
     @property
     def need_update(self) -> bool:
         """Return true if a HassOS update is available."""

supervisor/resolution/evaluations/os_version.py

@@ -38,7 +38,7 @@ async def evaluate(self) -> bool:
         if (
             not self.sys_os.available
             or not (current := self.sys_os.version)
-            or not (latest := self.sys_os.latest_version)
+            or not (latest := self.sys_os.latest_version_unrestricted)
             or not latest.major
         ):
             return False

supervisor/updater.py

@@ -18,6 +18,7 @@
     ATTR_CLI,
     ATTR_DNS,
     ATTR_HASSOS,
+    ATTR_HASSOS_UNRESTRICTED,
     ATTR_HOMEASSISTANT,
     ATTR_IMAGE,
     ATTR_MULTICAST,
@@ -84,6 +85,11 @@ def version_hassos(self) -> AwesomeVersion | None:
         """Return latest version of HassOS."""
         return self._data.get(ATTR_HASSOS)
 
+    @property
+    def version_hassos_unrestricted(self) -> AwesomeVersion | None:
+        """Return latest version of HassOS ignoring upgrade restrictions."""
+        return self._data.get(ATTR_HASSOS_UNRESTRICTED)
+
     @property
     def version_cli(self) -> AwesomeVersion | None:
         """Return latest version of CLI."""
@@ -275,6 +281,7 @@ async def fetch_data(self):
             if self.sys_os.board:
                 self._data[ATTR_OTA] = data["ota"]
                 if version := data["hassos"].get(self.sys_os.board):
+                    self._data[ATTR_HASSOS_UNRESTRICTED] = version
                     events.append("os")
                     upgrade_map = data.get("hassos-upgrade", {})
                     if last_in_major := upgrade_map.get(str(self.sys_os.version.major)):

supervisor/validate.py

@@ -23,6 +23,7 @@
     ATTR_ENABLE_IPV6,
     ATTR_FORCE_SECURITY,
     ATTR_HASSOS,
+    ATTR_HASSOS_UNRESTRICTED,
     ATTR_HOMEASSISTANT,
     ATTR_ID,
     ATTR_IMAGE,
@@ -126,6 +127,7 @@ def validate_repository(repository: str) -> str:
         vol.Optional(ATTR_HOMEASSISTANT): version_tag,
         vol.Optional(ATTR_SUPERVISOR): version_tag,
         vol.Optional(ATTR_HASSOS): version_tag,
+        vol.Optional(ATTR_HASSOS_UNRESTRICTED): version_tag,
         vol.Optional(ATTR_CLI): version_tag,
         vol.Optional(ATTR_DNS): version_tag,
         vol.Optional(ATTR_AUDIO): version_tag,

tests/resolution/evaluation/test_evaluate_os_version.py

@@ -49,7 +49,7 @@ async def test_os_version_evaluation(
         ),
         patch.object(
             OSManager,
-            "latest_version",
+            "latest_version_unrestricted",
             new=PropertyMock(return_value=latest and AwesomeVersion(latest)),
         ),
     ):