Merge 503dc232c4edf0a567c049b30573b7a4cce405b4 into ad5827d33fcdb448b156edbd492c482df90c2930

supervisor/homeassistant/core.py

@@ -221,6 +221,7 @@ class HomeAssistantCore(JobGroup):
             JobCondition.INTERNET_HOST,
             JobCondition.PLUGINS_UPDATED,
             JobCondition.SUPERVISOR_UPDATED,
+            JobCondition.ARCHITECTURE_SUPPORTED,
         ],
         limit=JobExecutionLimit.GROUP_ONCE,
         on_condition=HomeAssistantJobError,

supervisor/jobs/const.py

@@ -32,6 +32,7 @@ class JobCondition(StrEnum):
     PLUGINS_UPDATED = "plugins_updated"
     RUNNING = "running"
     SUPERVISOR_UPDATED = "supervisor_updated"
+    ARCHITECTURE_SUPPORTED = "architecture_supported"
 
 
 class JobExecutionLimit(StrEnum):

supervisor/jobs/decorator.py

@@ -17,7 +17,12 @@ from ..exceptions import (
     JobGroupExecutionLimitExceeded,
 )
 from ..host.const import HostFeature
-from ..resolution.const import MINIMUM_FREE_SPACE_THRESHOLD, ContextType, IssueType
+from ..resolution.const import (
+    MINIMUM_FREE_SPACE_THRESHOLD,
+    ContextType,
+    IssueType,
+    UnsupportedReason,
+)
 from ..utils.sentry import capture_exception
 from . import SupervisorJob
 from .const import JobCondition, JobExecutionLimit
@@ -435,6 +440,14 @@ class Job(CoreSysAttributes):
             raise JobConditionException(
                 f"'{method_name}' blocked from execution, supervisor needs to be updated first"
             )
+        if (
+            JobCondition.ARCHITECTURE_SUPPORTED in used_conditions
+            and UnsupportedReason.SYSTEM_ARCHITECTURE
+            in coresys.sys_resolution.unsupported
+        ):
+            raise JobConditionException(
+                f"'{method_name}' blocked from execution, unsupported system architecture"
+            )
 
         if JobCondition.PLUGINS_UPDATED in used_conditions and (
             out_of_date := [

supervisor/misc/tasks.py

@@ -150,6 +150,7 @@ class Tasks(CoreSysAttributes):
             JobCondition.HEALTHY,
             JobCondition.INTERNET_HOST,
             JobCondition.RUNNING,
+            JobCondition.ARCHITECTURE_SUPPORTED,
         ],
         limit=JobExecutionLimit.ONCE,
     )

supervisor/plugins/const.py

@@ -23,4 +23,5 @@ PLUGIN_UPDATE_CONDITIONS = [
     JobCondition.HEALTHY,
     JobCondition.INTERNET_HOST,
     JobCondition.SUPERVISOR_UPDATED,
+    JobCondition.ARCHITECTURE_SUPPORTED,
 ]

supervisor/resolution/const.py

@@ -58,6 +58,7 @@ class UnsupportedReason(StrEnum):
     SYSTEMD_JOURNAL = "systemd_journal"
     SYSTEMD_RESOLVED = "systemd_resolved"
     VIRTUALIZATION_IMAGE = "virtualization_image"
+    SYSTEM_ARCHITECTURE = "system_architecture"
 
 
 class UnhealthyReason(StrEnum):

supervisor/resolution/evaluations/system_architecture.py

@@ -0,0 +1,37 @@
+"""Evaluation class for system architecture support."""
+
+from ...const import CoreState
+from ...coresys import CoreSys
+from ..const import UnsupportedReason
+from .base import EvaluateBase
+
+
+def setup(coresys: CoreSys) -> EvaluateBase:
+    """Initialize evaluation-setup function."""
+    return EvaluateSystemArchitecture(coresys)
+
+
+class EvaluateSystemArchitecture(EvaluateBase):
+    """Evaluate if the current Supervisor architecture is supported."""
+
+    @property
+    def reason(self) -> UnsupportedReason:
+        """Return a UnsupportedReason enum."""
+        return UnsupportedReason.SYSTEM_ARCHITECTURE
+
+    @property
+    def on_failure(self) -> str:
+        """Return a string that is printed when self.evaluate is True."""
+        return "System architecture is no longer supported. Move to a supported system architecture."
+
+    @property
+    def states(self) -> list[CoreState]:
+        """Return a list of valid states when this evaluation can run."""
+        return [CoreState.INITIALIZE]
+
+    async def evaluate(self):
+        """Run evaluation."""
+        return self.sys_host.info.sys_arch.supervisor in {
+            "i386",
+            "armhf",
+        }

supervisor/updater.py

@@ -196,7 +196,7 @@ class Updater(FileConfiguration, CoreSysAttributes):
 
     @Job(
         name="updater_fetch_data",
-        conditions=[JobCondition.INTERNET_SYSTEM],
+        conditions=[JobCondition.INTERNET_SYSTEM, JobCondition.ARCHITECTURE_SUPPORTED],
         on_condition=UpdaterJobError,
         limit=JobExecutionLimit.THROTTLE_WAIT,
         throttle_period=timedelta(seconds=30),

tests/resolution/evaluation/test_system_architecture.py

@@ -0,0 +1,43 @@
+"""Test evaluation supported system architectures."""
+
+from unittest.mock import PropertyMock, patch
+
+import pytest
+
+from supervisor.const import CoreState
+from supervisor.coresys import CoreSys
+from supervisor.resolution.evaluations.system_architecture import (
+    EvaluateSystemArchitecture,
+)
+
+
+@pytest.mark.parametrize("arch", ["i386", "armhf"])
+async def test_evaluation_unsupported_architectures(
+    coresys: CoreSys,
+    arch: str,
+):
+    """Test evaluation of unsupported system architectures."""
+    system_architecture = EvaluateSystemArchitecture(coresys)
+    coresys.core.state = CoreState.INITIALIZE
+
+    with patch.object(
+        type(coresys.supervisor), "arch", PropertyMock(return_value=arch)
+    ):
+        await system_architecture()
+        assert system_architecture.reason in coresys.resolution.unsupported
+
+
+@pytest.mark.parametrize("arch", ["amd64", "aarch64", "armv7"])
+async def test_evaluation_supported_architectures(
+    coresys: CoreSys,
+    arch: str,
+):
+    """Test evaluation of supported system architectures."""
+    system_architecture = EvaluateSystemArchitecture(coresys)
+    coresys.core.state = CoreState.INITIALIZE
+
+    with patch.object(
+        type(coresys.supervisor), "arch", PropertyMock(return_value=arch)
+    ):
+        await system_architecture()
+        assert system_architecture.reason not in coresys.resolution.unsupported