From 05ded4aaa84268d4ad53ab4037e889c2c0915f68 Mon Sep 17 00:00:00 2001 From: Simon de Vlieger Date: Thu, 7 Aug 2025 08:45:15 +0200 Subject: [PATCH] imagebuilder: accept `manifest_type` The `imagebuilder` phase was missing the `manifest_type` property in its schema. While pungi (often) guesses correctly for the `manifest_type` it doesn't do so in the case of ostree installer images; thus it needs to be allowed. This was an oversight as the phase implementation already looked for this value in the configuration. Signed-off-by: Simon de Vlieger (cherry picked from commit 0ade83b0e9adc43b4e9fd38d536d647f42126688) --- pungi/checks.py | 1 + tests/test_imagebuilderphase.py | 1 + 2 files changed, 2 insertions(+) diff --git a/pungi/checks.py b/pungi/checks.py index 1b3336ac..3112170c 100644 --- a/pungi/checks.py +++ b/pungi/checks.py @@ -1463,6 +1463,7 @@ def make_schema(): "additionalProperties": True, }, "seed": {"type": "integer"}, + "manifest_type": {"type": "string"}, }, "required": [ "name", diff --git a/tests/test_imagebuilderphase.py b/tests/test_imagebuilderphase.py index 57ede26a..c1bd1478 100644 --- a/tests/test_imagebuilderphase.py +++ b/tests/test_imagebuilderphase.py @@ -61,6 +61,7 @@ class TestImageBuilderPhase(PungiTestCase): "repos": ["https://example.com/repo/", "Client"], "types": ["custom"], "version": "Rawhide", + "manifest_type": "custom-type", }, ) compose = DummyCompose(self.topdir, {"imagebuilder": {"^Server$": [cfg]}})