From d3cad4795c612c4606c70d7c114222ac351a0890 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= Date: Tue, 6 Dec 2016 12:35:57 +0100 Subject: [PATCH] metadata: Allow creating internal releases MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The internal flag in productmd is meant to indicate that a compose is not meant for publishing. This is potentially useful to allow filtering in PDC or similar service. Signed-off-by: Lubomír Sedlář --- doc/configuration.rst | 3 +++ pungi/checks.py | 1 + pungi/compose.py | 1 + pungi/metadata.py | 1 + tests/test_compose.py | 4 ++++ 5 files changed, 10 insertions(+) diff --git a/doc/configuration.rst b/doc/configuration.rst index 58be31e3..62d73612 100644 --- a/doc/configuration.rst +++ b/doc/configuration.rst @@ -68,6 +68,9 @@ Options **release_is_layered** = False (*bool*) -- typically False for an operating system, True otherwise +**release_internal** = False + (*bool*) -- whether the compose is meant for public consumption + Example ------- diff --git a/pungi/checks.py b/pungi/checks.py index be7cfc72..436477dd 100644 --- a/pungi/checks.py +++ b/pungi/checks.py @@ -399,6 +399,7 @@ def _make_schema(): "default": "ga", }, "release_is_layered": {"type": "boolean"}, + "release_internal": {"type": "boolean", "default": False}, "release_discinfo_description": {"type": "string"}, "base_product_name": {"type": "string"}, diff --git a/pungi/compose.py b/pungi/compose.py index b3a967a2..ceb142c1 100644 --- a/pungi/compose.py +++ b/pungi/compose.py @@ -47,6 +47,7 @@ def get_compose_dir(topdir, conf, compose_type="production", compose_date=None, ci.release.version = conf["release_version"] ci.release.is_layered = bool(conf.get("release_is_layered", False)) ci.release.type = conf.get("release_type", "ga").lower() + ci.release.internal = bool(conf.get("release_internal", False)) if ci.release.is_layered: ci.base_product.name = conf["base_product_name"] ci.base_product.short = conf["base_product_short"] diff --git a/pungi/metadata.py b/pungi/metadata.py index b1184043..7ae82d8e 100644 --- a/pungi/metadata.py +++ b/pungi/metadata.py @@ -79,6 +79,7 @@ def compose_to_composeinfo(compose): ci.release.short = compose.conf["release_short"] ci.release.is_layered = compose.conf["release_is_layered"] ci.release.type = compose.conf["release_type"].lower() + ci.release.internal = bool(compose.conf["release_internal"]) # base product if ci.release.is_layered: diff --git a/tests/test_compose.py b/tests/test_compose.py index a8c1c76c..bc7cacce 100644 --- a/tests/test_compose.py +++ b/tests/test_compose.py @@ -226,6 +226,7 @@ class ComposeTestCase(unittest.TestCase): release_short='test', release_type='ga', release_is_layered=False, + release_internal=False, ) compose = Compose(conf, self.tmp_dir) @@ -266,6 +267,7 @@ class ComposeTestCase(unittest.TestCase): release_short='test', release_type='ga', release_is_layered=False, + release_internal=False, tree_arches=['x86_64'], ) @@ -310,6 +312,7 @@ class ComposeTestCase(unittest.TestCase): release_short='test', release_type='ga', release_is_layered=False, + release_internal=False, tree_variants=['Server', 'Client', 'Server-Gluster'], ) @@ -347,6 +350,7 @@ class ComposeTestCase(unittest.TestCase): release_short='test', release_type='ga', release_is_layered=False, + release_internal=False, tree_variants=['Server', 'Client', 'Server-optional'], tree_arches=['x86_64'], )