From 5da9a2fb639f6ced0196f8a91d598f6c4c90c814 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Budai?= Date: Mon, 29 Apr 2024 14:25:00 +0200 Subject: [PATCH] stages/kickstart: add support for the dir transport Also, let's adjust the test. --- stages/org.osbuild.kickstart.meta.json | 3 ++- stages/test/test_kickstart.py | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/stages/org.osbuild.kickstart.meta.json b/stages/org.osbuild.kickstart.meta.json index 21ad84b3..77952f9b 100644 --- a/stages/org.osbuild.kickstart.meta.json +++ b/stages/org.osbuild.kickstart.meta.json @@ -187,7 +187,8 @@ "enum": [ "registry", "oci", - "oci-archive" + "oci-archive", + "dir" ], "description": "Use the given transport, Anaconda's default is 'registry'" }, diff --git a/stages/test/test_kickstart.py b/stages/test/test_kickstart.py index 1aeeb305..ad211dd4 100644 --- a/stages/test/test_kickstart.py +++ b/stages/test/test_kickstart.py @@ -234,6 +234,12 @@ TEST_INPUT = [ }, "ostreecontainer --url=http://some-ostree-url.com/foo", ), + ({"ostreecontainer": {"transport": "oci", "url": "/run/install/repo/container", }, }, + "ostreecontainer --url=/run/install/repo/container --transport=oci",), + ({"ostreecontainer": {"transport": "oci-archive", "url": "/run/install/repo/container.tar", }, }, + "ostreecontainer --url=/run/install/repo/container.tar --transport=oci-archive",), + ({"ostreecontainer": {"transport": "dir", "url": "/run/install/repo/container", }, }, + "ostreecontainer --url=/run/install/repo/container --transport=dir",), ({"bootloader": {"append": "karg1 karg2=0"}}, "bootloader --append='karg1 karg2=0'"), ]