From 31bafa29c5b7daa2ea31eeabb2722feba7b83fa9 Mon Sep 17 00:00:00 2001 From: Jan Kaluza Date: Feb 07 2019 12:59:57 +0000 Subject: Allow setting wildcard as a module name in variants to include all the modules. Signed-off-by: Jan Kaluza --- diff --git a/pungi/phases/pkgset/sources/source_koji.py b/pungi/phases/pkgset/sources/source_koji.py index dd1b64f..a5f58ce 100644 --- a/pungi/phases/pkgset/sources/source_koji.py +++ b/pungi/phases/pkgset/sources/source_koji.py @@ -345,6 +345,10 @@ def filter_by_whitelist(compose, module_builds, input_modules): specs = set() nvr_prefixes = set() for spec in input_modules: + # Do not do any filtering in case variant wants all the modules. + if spec["name"] == "*": + return module_builds + info = variant_dict_from_str(compose, spec["name"]) prefix = ("%s-%s-%s.%s" % ( info["name"], diff --git a/tests/test_pkgset_source_koji.py b/tests/test_pkgset_source_koji.py index 85854cd..d24afb8 100644 --- a/tests/test_pkgset_source_koji.py +++ b/tests/test_pkgset_source_koji.py @@ -799,6 +799,26 @@ class TestFilterByWhitelist(unittest.TestCase): result, [{"nvr": "foo-1-201809031047.deadbeef"}] ) + def test_filter_by_wildcard(self): + compose = mock.Mock() + module_builds = [ + {"nvr": "foo-1-201809031048.cafebabe"}, + {"nvr": "foo-1-201809031047.deadbeef"}, + {"nvr": "foo-2-201809031047.deadbeef"}, + ] + input_modules = [{"name": "*"}] + + result = source_koji.filter_by_whitelist(compose, module_builds, input_modules) + + self.assertItemsEqual( + result, + [ + {"nvr": "foo-1-201809031048.cafebabe"}, + {"nvr": "foo-1-201809031047.deadbeef"}, + {"nvr": "foo-2-201809031047.deadbeef"}, + ], + ) + if __name__ == "__main__": unittest.main()