From 80fad37de37d68730bdae249fa72c8bda99363b1 Mon Sep 17 00:00:00 2001 From: castrojo Date: Wed, 23 Sep 2026 08:00:04 -0400 Subject: [PATCH] fix(flatcar): use flatcar-kernel-container-sha256 variable in flatcar-usr.bst --- elements/flatcar/flatcar-usr.bst | 2 +- tests/unit/test_flatcar_usr.py | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/elements/flatcar/flatcar-usr.bst b/elements/flatcar/flatcar-usr.bst index 2bdc4259..8229cd11 100644 --- a/elements/flatcar/flatcar-usr.bst +++ b/elements/flatcar/flatcar-usr.bst @@ -21,7 +21,7 @@ variables: sources: - kind: remote url: flatcar:stable/%{flatcar-board}/%{flatcar-version}/flatcar-container.tar.gz - ref: c533ff576e128d11ce240e01f818c358d75b9ff118b2dd9199fbf4684547a32c + ref: "%{flatcar-kernel-container-sha256}" config: install-commands: diff --git a/tests/unit/test_flatcar_usr.py b/tests/unit/test_flatcar_usr.py index 810e94fd..70f47476 100644 --- a/tests/unit/test_flatcar_usr.py +++ b/tests/unit/test_flatcar_usr.py @@ -104,14 +104,16 @@ def test_flatcar_usr_element_structure() -> None: "variables.strip-binaries must be empty string to prevent stripping" ) - # Exactly one remote source for flatcar-container.tar.gz pinned by sha256 + # Exactly one remote source for flatcar-container.tar.gz pinned via include/flatcar.yml sources = data.get("sources", []) assert len(sources) == 1, "Must declare exactly one source" src = sources[0] assert src.get("kind") == "remote" assert src.get("url") == "flatcar:stable/%{flatcar-board}/%{flatcar-version}/flatcar-container.tar.gz" - assert len(src.get("ref", "")) == 64, "Source ref must be a valid sha256 hash" - + ref = src.get("ref", "") + assert ref == "%{flatcar-kernel-container-sha256}" or len(ref) == 64, ( + "Source ref must reference %{flatcar-kernel-container-sha256} or be a valid sha256 hash" + ) def test_flatcar_usr_explicit_removals_and_replacements() -> None: """Verify explicit rm lines and Bluefin replacement documentation."""