From c4aa45beab9f0b0945db3c1c5b777844009c3534 Mon Sep 17 00:00:00 2001 From: Lingyan Zhuang Date: Sat, 7 May 2022 19:58:19 +0800 Subject: [PATCH] Add skip_branding to ostree_installer. Fixes: #1594 Merges: https://pagure.io/pungi/pull-request/1609 Signed-off-by: Lingyan Zhuang --- doc/configuration.rst | 2 ++ pungi/checks.py | 1 + pungi/phases/ostree_installer.py | 1 + 3 files changed, 4 insertions(+) diff --git a/doc/configuration.rst b/doc/configuration.rst index 4600e69b..4a7f8986 100644 --- a/doc/configuration.rst +++ b/doc/configuration.rst @@ -1786,6 +1786,8 @@ an OSTree repository. This always runs in Koji as a ``runroot`` task. with the optional key: * ``extra_runroot_pkgs`` -- (*[str]*) + * ``skip_branding`` -- (*bool*) Stops lorax to install packages with branding. + Defaults to ``False``. **ostree_installer_overwrite** = False (*bool*) -- by default if a variant including OSTree installer also creates diff --git a/pungi/checks.py b/pungi/checks.py index a08b5638..bc5d908f 100644 --- a/pungi/checks.py +++ b/pungi/checks.py @@ -1078,6 +1078,7 @@ def make_schema(): "template_repo": {"type": "string"}, "template_branch": {"type": "string"}, "extra_runroot_pkgs": {"$ref": "#/definitions/list_of_strings"}, + "skip_branding": {"type": "boolean"}, }, "additionalProperties": False, } diff --git a/pungi/phases/ostree_installer.py b/pungi/phases/ostree_installer.py index 3424ea8c..8e9a1f6e 100644 --- a/pungi/phases/ostree_installer.py +++ b/pungi/phases/ostree_installer.py @@ -272,6 +272,7 @@ class OstreeInstallerThread(WorkerThread): rootfs_size=config.get("rootfs_size"), is_final=compose.supported, log_dir=self.logdir, + skip_branding=config.get("skip_branding"), ) cmd = "rm -rf %s && %s" % ( shlex_quote(output_dir),