pkgset: Load modulemd only when needed
We can avoid parsing source modulemd information since we can get the same information from the Koji build info. Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
This commit is contained in:
Lubomír Sedlář
parent
04baa2a4db
commit
da78b99fc0
|
|
@ -235,7 +235,7 @@ def _add_module_to_variant(koji_wrapper, variant, build, add_to_variant_modules=
|
|||
filename = "modulemd.%s.txt" % getBaseArch(arch)
|
||||
except ValueError:
|
||||
pass
|
||||
mmds[filename] = Modulemd.Module.new_from_file(file_path)
|
||||
mmds[filename] = file_path
|
||||
|
||||
if len(mmds) <= 1:
|
||||
# There was only one modulemd file. This means the build is rather old
|
||||
|
|
@ -243,15 +243,12 @@ def _add_module_to_variant(koji_wrapper, variant, build, add_to_variant_modules=
|
|||
# longer supported and should be rebuilt. Let's skip it.
|
||||
return
|
||||
|
||||
source_mmd = mmds["modulemd.txt"]
|
||||
# Set name from build to modulemd. Generally it will match, but for devel
|
||||
# modules the source mmd contains the original name.
|
||||
source_mmd.set_name(build["extra"]["typeinfo"]["module"]["name"])
|
||||
nsvc = source_mmd.dup_nsvc()
|
||||
nsvc = "%(name)s:%(stream)s:%(version)s:%(context)s" % build["extra"]["typeinfo"]["module"]
|
||||
|
||||
for arch in variant.arches:
|
||||
try:
|
||||
variant.arch_mmds.setdefault(arch, {})[nsvc] = mmds["modulemd.%s.txt" % arch]
|
||||
mmd = Modulemd.Module.new_from_file(mmds["modulemd.%s.txt" % arch])
|
||||
variant.arch_mmds.setdefault(arch, {})[nsvc] = mmd
|
||||
except KeyError:
|
||||
# There is no modulemd for this arch. This could mean an arch was
|
||||
# added to the compose after the module was built. We don't want to
|
||||
|
|
@ -261,7 +258,7 @@ def _add_module_to_variant(koji_wrapper, variant, build, add_to_variant_modules=
|
|||
if add_to_variant_modules:
|
||||
variant.modules.append(nsvc)
|
||||
|
||||
return source_mmd
|
||||
return nsvc
|
||||
|
||||
|
||||
def _get_modules_from_koji(compose, koji_wrapper, event, variant, variant_tags):
|
||||
|
|
@ -281,12 +278,11 @@ def _get_modules_from_koji(compose, koji_wrapper, event, variant, variant_tags):
|
|||
for module in variant.get_modules():
|
||||
koji_modules = get_koji_modules(compose, koji_wrapper, event, module["name"])
|
||||
for koji_module in koji_modules:
|
||||
mmd = _add_module_to_variant(koji_wrapper, variant, koji_module)
|
||||
if not mmd:
|
||||
nsvc = _add_module_to_variant(koji_wrapper, variant, koji_module)
|
||||
if not nsvc:
|
||||
continue
|
||||
|
||||
tag = koji_module["tag"]
|
||||
nsvc = mmd.dup_nsvc()
|
||||
variant_tags[variant].append(tag)
|
||||
|
||||
# Store mapping NSVC --> koji_tag into variant.
|
||||
|
|
@ -461,13 +457,12 @@ def _get_modules_from_koji_tags(compose, koji_wrapper, event_id, variant, varian
|
|||
|
||||
variant_tags[variant].append(module_tag)
|
||||
|
||||
mmd = _add_module_to_variant(koji_wrapper, variant, build, True)
|
||||
if not mmd:
|
||||
nsvc = _add_module_to_variant(koji_wrapper, variant, build, True)
|
||||
if not nsvc:
|
||||
continue
|
||||
|
||||
# Store mapping module-uid --> koji_tag into variant.
|
||||
# This is needed in createrepo phase where metadata is exposed by producmd
|
||||
nsvc = mmd.dup_nsvc()
|
||||
variant.module_uid_to_koji_tag[nsvc] = module_tag
|
||||
|
||||
module_msg = "Module {module} in variant {variant} will use Koji tag {tag}.".format(
|
||||
|
|
|
|||
|
|
@ -684,12 +684,6 @@ class MockModule(object):
|
|||
def __eq__(self, other):
|
||||
return self.path == other.path
|
||||
|
||||
def dup_nsvc(self):
|
||||
return "module:master:20190318.abcdef"
|
||||
|
||||
def set_name(self, name):
|
||||
pass
|
||||
|
||||
|
||||
@mock.patch("pungi.Modulemd.Module.new_from_file", new=MockModule)
|
||||
@unittest.skipIf(Modulemd is None, "Skipping tests, no module support")
|
||||
|
|
@ -702,104 +696,113 @@ class TestAddModuleToVariant(unittest.TestCase):
|
|||
self.koji.koji_proxy.listArchives.return_value = [
|
||||
{"btype": "module", "filename": fname} for fname in files
|
||||
] + [{"btype": "foo"}]
|
||||
self.buildinfo = {
|
||||
"id": 1234,
|
||||
"extra": {
|
||||
"typeinfo": {
|
||||
"module": {
|
||||
"name": "module",
|
||||
"stream": "master",
|
||||
"version": "20190318",
|
||||
"context": "abcdef",
|
||||
},
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
def test_adding_module(self):
|
||||
build = {"id": 1234, "extra": {"typeinfo": {"module": {"name": "module"}}}}
|
||||
variant = mock.Mock(
|
||||
arches=["armhfp", "x86_64"], arch_mmds={}, modules=[]
|
||||
)
|
||||
|
||||
source_koji._add_module_to_variant(self.koji, variant, build)
|
||||
source_koji._add_module_to_variant(self.koji, variant, self.buildinfo)
|
||||
|
||||
self.assertEqual(
|
||||
variant.arch_mmds,
|
||||
{
|
||||
"armhfp": {
|
||||
"module:master:20190318.abcdef": MockModule("/koji/modulemd.armv7hl.txt"),
|
||||
"module:master:20190318:abcdef": MockModule("/koji/modulemd.armv7hl.txt"),
|
||||
},
|
||||
"x86_64": {
|
||||
"module:master:20190318.abcdef": MockModule("/koji/modulemd.x86_64.txt"),
|
||||
"module:master:20190318:abcdef": MockModule("/koji/modulemd.x86_64.txt"),
|
||||
},
|
||||
},
|
||||
)
|
||||
self.assertEqual(variant.modules, [])
|
||||
|
||||
def test_adding_module_to_existing(self):
|
||||
build = {"id": 1234, "extra": {"typeinfo": {"module": {"name": "module"}}}}
|
||||
variant = mock.Mock(
|
||||
arches=["armhfp", "x86_64"],
|
||||
arch_mmds={
|
||||
"x86_64": {"m1:latest:20190101.cafe": MockModule("/koji/m1.x86_64.txt")}
|
||||
"x86_64": {"m1:latest:20190101:cafe": MockModule("/koji/m1.x86_64.txt")}
|
||||
},
|
||||
modules=["m1:latest-20190101.cafe"],
|
||||
modules=["m1:latest-20190101:cafe"],
|
||||
)
|
||||
|
||||
source_koji._add_module_to_variant(self.koji, variant, build)
|
||||
source_koji._add_module_to_variant(self.koji, variant, self.buildinfo)
|
||||
|
||||
self.assertEqual(
|
||||
variant.arch_mmds,
|
||||
{
|
||||
"armhfp": {
|
||||
"module:master:20190318.abcdef": MockModule("/koji/modulemd.armv7hl.txt"),
|
||||
"module:master:20190318:abcdef": MockModule("/koji/modulemd.armv7hl.txt"),
|
||||
},
|
||||
"x86_64": {
|
||||
"module:master:20190318.abcdef": MockModule("/koji/modulemd.x86_64.txt"),
|
||||
"m1:latest:20190101.cafe": MockModule("/koji/m1.x86_64.txt"),
|
||||
"module:master:20190318:abcdef": MockModule("/koji/modulemd.x86_64.txt"),
|
||||
"m1:latest:20190101:cafe": MockModule("/koji/m1.x86_64.txt"),
|
||||
},
|
||||
},
|
||||
)
|
||||
self.assertEqual(variant.modules, ["m1:latest-20190101.cafe"])
|
||||
self.assertEqual(variant.modules, ["m1:latest-20190101:cafe"])
|
||||
|
||||
def test_adding_module_with_add_module(self):
|
||||
build = {"id": 1234, "extra": {"typeinfo": {"module": {"name": "module"}}}}
|
||||
variant = mock.Mock(
|
||||
arches=["armhfp", "x86_64"], arch_mmds={}, modules=[]
|
||||
)
|
||||
|
||||
source_koji._add_module_to_variant(
|
||||
self.koji, variant, build, add_to_variant_modules=True
|
||||
self.koji, variant, self.buildinfo, add_to_variant_modules=True
|
||||
)
|
||||
|
||||
self.assertEqual(
|
||||
variant.arch_mmds,
|
||||
{
|
||||
"armhfp": {
|
||||
"module:master:20190318.abcdef": MockModule("/koji/modulemd.armv7hl.txt"),
|
||||
"module:master:20190318:abcdef": MockModule("/koji/modulemd.armv7hl.txt"),
|
||||
},
|
||||
"x86_64": {
|
||||
"module:master:20190318.abcdef": MockModule("/koji/modulemd.x86_64.txt"),
|
||||
"module:master:20190318:abcdef": MockModule("/koji/modulemd.x86_64.txt"),
|
||||
},
|
||||
},
|
||||
)
|
||||
self.assertEqual(variant.modules, ["module:master:20190318.abcdef"])
|
||||
self.assertEqual(variant.modules, ["module:master:20190318:abcdef"])
|
||||
|
||||
def test_adding_module_to_existing_with_add_module(self):
|
||||
build = {"id": 1234, "extra": {"typeinfo": {"module": {"name": "module"}}}}
|
||||
variant = mock.Mock(
|
||||
arches=["armhfp", "x86_64"],
|
||||
arch_mmds={
|
||||
"x86_64": {"m1:latest:20190101.cafe": MockModule("/koji/m1.x86_64.txt")}
|
||||
"x86_64": {"m1:latest:20190101:cafe": MockModule("/koji/m1.x86_64.txt")}
|
||||
},
|
||||
modules=["m1:latest-20190101.cafe"],
|
||||
modules=["m1:latest-20190101:cafe"],
|
||||
)
|
||||
|
||||
source_koji._add_module_to_variant(
|
||||
self.koji, variant, build, add_to_variant_modules=True
|
||||
self.koji, variant, self.buildinfo, add_to_variant_modules=True
|
||||
)
|
||||
|
||||
self.assertEqual(
|
||||
variant.arch_mmds,
|
||||
{
|
||||
"armhfp": {
|
||||
"module:master:20190318.abcdef": MockModule("/koji/modulemd.armv7hl.txt"),
|
||||
"module:master:20190318:abcdef": MockModule("/koji/modulemd.armv7hl.txt"),
|
||||
},
|
||||
"x86_64": {
|
||||
"module:master:20190318.abcdef": MockModule("/koji/modulemd.x86_64.txt"),
|
||||
"m1:latest:20190101.cafe": MockModule("/koji/m1.x86_64.txt"),
|
||||
"module:master:20190318:abcdef": MockModule("/koji/modulemd.x86_64.txt"),
|
||||
"m1:latest:20190101:cafe": MockModule("/koji/m1.x86_64.txt"),
|
||||
},
|
||||
},
|
||||
)
|
||||
self.assertEqual(
|
||||
variant.modules,
|
||||
["m1:latest-20190101.cafe", "module:master:20190318.abcdef"],
|
||||
["m1:latest-20190101:cafe", "module:master:20190318:abcdef"],
|
||||
)
|
||||
|
|
|
|||
Loading…
Reference in New Issue