almalinux/pungi
13
1
Fork 0
Code Issues Pull Requests Releases Activity

pkgset: Add name to package set

Browse Source 
This name will serve as an identifier for the group of packages.

For Koji package sets, it should the name of the tag from which the
packages come. For package sets based on repos a dummy constant name is
used.

Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
This commit is contained in:
Lubomír Sedlář 2019-07-25 15:35:02 +02:00
parent be61da0192
commit 3f665937b2
4 changed files with 86 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pungi/phases/pkgset/pkgsets.py
View File

@ -80,9 +80,10 @@ class ReaderThread(WorkerThread):
class PackageSetBase(kobo.log.LoggingBase): class PackageSetBase(kobo.log.LoggingBase):
def __init__(self, sigkey_ordering, arches=None, logger=None, def __init__(self, name, sigkey_ordering, arches=None, logger=None,
allow_invalid_sigkeys=False): allow_invalid_sigkeys=False):
super(PackageSetBase, self).__init__(logger=logger) super(PackageSetBase, self).__init__(logger=logger)
self.name = name
self.file_cache = kobo.pkgset.FileCache(kobo.pkgset.SimpleRpmWrapper) self.file_cache = kobo.pkgset.FileCache(kobo.pkgset.SimpleRpmWrapper)
self.old_file_cache = None self.old_file_cache = None
self.sigkey_ordering = tuple(sigkey_ordering or [None]) self.sigkey_ordering = tuple(sigkey_ordering or [None])
@ -284,7 +285,7 @@ class FilelistPackageSet(PackageSetBase):
class KojiPackageSet(PackageSetBase): class KojiPackageSet(PackageSetBase):
def __init__(self, koji_wrapper, sigkey_ordering, arches=None, logger=None, def __init__(self, name, koji_wrapper, sigkey_ordering, arches=None, logger=None,
packages=None, allow_invalid_sigkeys=False, packages=None, allow_invalid_sigkeys=False,
populate_only_packages=False, cache_region=None, populate_only_packages=False, cache_region=None,
extra_builds=None): extra_builds=None):
@ -317,9 +318,13 @@ class KojiPackageSet(PackageSetBase):
:param list extra_builds: Extra builds NVRs to get from Koji and include :param list extra_builds: Extra builds NVRs to get from Koji and include
in the package set. in the package set.
""" """
super(KojiPackageSet, self).__init__(sigkey_ordering=sigkey_ordering, super(KojiPackageSet, self).__init__(
arches=arches, logger=logger, name,
allow_invalid_sigkeys=allow_invalid_sigkeys) sigkey_ordering=sigkey_ordering,
arches=arches,
logger=logger,
allow_invalid_sigkeys=allow_invalid_sigkeys
)
self.koji_wrapper = koji_wrapper self.koji_wrapper = koji_wrapper
# Names of packages to look for in the Koji tag. # Names of packages to look for in the Koji tag.
self.packages = set(packages or []) self.packages = set(packages or [])

17
pungi/phases/pkgset/sources/source_koji.py
View File

@ -529,8 +529,12 @@ def populate_global_pkgset(compose, koji_wrapper, path_prefix, event):
for variant in compose.all_variants.values(): for variant in compose.all_variants.values():
# pkgset storing the packages belonging to this particular variant. # pkgset storing the packages belonging to this particular variant.
variant.pkgset = pungi.phases.pkgset.pkgsets.KojiPackageSet( variant.pkgset = pungi.phases.pkgset.pkgsets.KojiPackageSet(
koji_wrapper, compose.conf["sigkeys"], logger=compose._logger, "TODO",
arches=all_arches) koji_wrapper,
compose.conf["sigkeys"],
logger=compose._logger,
arches=all_arches,
)
variant_tags[variant] = [] variant_tags[variant] = []
# Get the modules from Koji tag or from PDC, depending on # Get the modules from Koji tag or from PDC, depending on
@ -578,8 +582,12 @@ def populate_global_pkgset(compose, koji_wrapper, path_prefix, event):
inherit_modules = compose.conf["pkgset_koji_inherit_modules"] inherit_modules = compose.conf["pkgset_koji_inherit_modules"]
global_pkgset = pungi.phases.pkgset.pkgsets.KojiPackageSet( global_pkgset = pungi.phases.pkgset.pkgsets.KojiPackageSet(
koji_wrapper, compose.conf["sigkeys"], logger=compose._logger, "TODO",
arches=all_arches) koji_wrapper,
compose.conf["sigkeys"],
logger=compose._logger,
arches=all_arches,
)
old_file_cache_path = _find_old_file_cache_path(compose) old_file_cache_path = _find_old_file_cache_path(compose)
old_file_cache = None old_file_cache = None
@ -602,6 +610,7 @@ def populate_global_pkgset(compose, koji_wrapper, path_prefix, event):
else: else:
extra_builds = [] extra_builds = []
pkgset = pungi.phases.pkgset.pkgsets.KojiPackageSet( pkgset = pungi.phases.pkgset.pkgsets.KojiPackageSet(
"TODO",
koji_wrapper, compose.conf["sigkeys"], logger=compose._logger, koji_wrapper, compose.conf["sigkeys"], logger=compose._logger,
arches=all_arches, packages=packages_to_gather, arches=all_arches, packages=packages_to_gather,
allow_invalid_sigkeys=allow_invalid_sigkeys, allow_invalid_sigkeys=allow_invalid_sigkeys,

2
pungi/phases/pkgset/sources/source_repos.py
View File

@ -124,7 +124,7 @@ def populate_global_pkgset(compose, file_list, path_prefix):
compose.log_info("Populating the global package set from a file list") compose.log_info("Populating the global package set from a file list")
pkgset = pungi.phases.pkgset.pkgsets.FilelistPackageSet( pkgset = pungi.phases.pkgset.pkgsets.FilelistPackageSet(
compose.conf["sigkeys"], logger=compose._logger, arches=ALL_ARCHES "repos", compose.conf["sigkeys"], logger=compose._logger, arches=ALL_ARCHES
) )
pkgset.populate(file_list) pkgset.populate(file_list)
with open(global_pkgset_path, "wb") as f: with open(global_pkgset_path, "wb") as f:

94
tests/test_pkgset_pkgsets.py
View File

@ -167,7 +167,7 @@ class TestKojiPkgset(PkgsetCompareMixin, helpers.PungiTestCase):
'rpms/bash-debuginfo@4.3.42@4.fc24@x86_64', 'rpms/bash-debuginfo@4.3.42@4.fc24@x86_64',
]) ])
pkgset = pkgsets.KojiPackageSet(self.koji_wrapper, [None]) pkgset = pkgsets.KojiPackageSet("pkgset", self.koji_wrapper, [None])
result = pkgset.populate('f25', logfile=self.topdir + '/pkgset.log') result = pkgset.populate('f25', logfile=self.topdir + '/pkgset.log')
@ -202,7 +202,9 @@ class TestKojiPkgset(PkgsetCompareMixin, helpers.PungiTestCase):
'rpms/bash-debuginfo@4.3.42@4.fc24@x86_64', 'rpms/bash-debuginfo@4.3.42@4.fc24@x86_64',
]) ])
pkgset = pkgsets.KojiPackageSet(self.koji_wrapper, [None], arches=['x86_64']) pkgset = pkgsets.KojiPackageSet(
"pkgset", self.koji_wrapper, [None], arches=['x86_64']
)
result = pkgset.populate('f25') result = pkgset.populate('f25')
@ -221,7 +223,9 @@ class TestKojiPkgset(PkgsetCompareMixin, helpers.PungiTestCase):
'signed/deadbeef/bash-debuginfo@4.3.42@4.fc24@x86_64', 'signed/deadbeef/bash-debuginfo@4.3.42@4.fc24@x86_64',
]) ])
pkgset = pkgsets.KojiPackageSet(self.koji_wrapper, ['cafebabe', 'deadbeef'], arches=['x86_64']) pkgset = pkgsets.KojiPackageSet(
"pkgset", self.koji_wrapper, ['cafebabe', 'deadbeef'], arches=['x86_64']
)
result = pkgset.populate('f25') result = pkgset.populate('f25')
@ -239,7 +243,9 @@ class TestKojiPkgset(PkgsetCompareMixin, helpers.PungiTestCase):
'rpms/bash-debuginfo@4.3.42@4.fc24@x86_64', 'rpms/bash-debuginfo@4.3.42@4.fc24@x86_64',
]) ])
pkgset = pkgsets.KojiPackageSet(self.koji_wrapper, ['cafebabe', None], arches=['x86_64']) pkgset = pkgsets.KojiPackageSet(
"pkgset", self.koji_wrapper, ['cafebabe', None], arches=['x86_64']
)
result = pkgset.populate('f25') result = pkgset.populate('f25')
@ -252,7 +258,9 @@ class TestKojiPkgset(PkgsetCompareMixin, helpers.PungiTestCase):
'signed/cafebabe/bash@4.3.42@4.fc24@x86_64']}) 'signed/cafebabe/bash@4.3.42@4.fc24@x86_64']})
def test_can_not_find_signed_package(self): def test_can_not_find_signed_package(self):
pkgset = pkgsets.KojiPackageSet(self.koji_wrapper, ['cafebabe'], arches=['x86_64']) pkgset = pkgsets.KojiPackageSet(
"pkgset", self.koji_wrapper, ['cafebabe'], arches=['x86_64']
)
with self.assertRaises(RuntimeError) as ctx: with self.assertRaises(RuntimeError) as ctx:
pkgset.populate('f25') pkgset.populate('f25')
@ -267,8 +275,13 @@ class TestKojiPkgset(PkgsetCompareMixin, helpers.PungiTestCase):
self.assertRegexpMatches(str(ctx.exception), figure) self.assertRegexpMatches(str(ctx.exception), figure)
def test_can_not_find_signed_package_allow_invalid_sigkeys(self): def test_can_not_find_signed_package_allow_invalid_sigkeys(self):
pkgset = pkgsets.KojiPackageSet(self.koji_wrapper, ['cafebabe'], arches=['x86_64'], pkgset = pkgsets.KojiPackageSet(
allow_invalid_sigkeys=True) "pkgset",
self.koji_wrapper,
['cafebabe'],
arches=['x86_64'],
allow_invalid_sigkeys=True,
)
pkgset.populate('f25') pkgset.populate('f25')
@ -285,7 +298,9 @@ class TestKojiPkgset(PkgsetCompareMixin, helpers.PungiTestCase):
self.assertRegexpMatches(str(ctx.exception), figure) self.assertRegexpMatches(str(ctx.exception), figure)
def test_can_not_find_any_package(self): def test_can_not_find_any_package(self):
pkgset = pkgsets.KojiPackageSet(self.koji_wrapper, ['cafebabe', None], arches=['x86_64']) pkgset = pkgsets.KojiPackageSet(
"pkgset", self.koji_wrapper, ['cafebabe', None], arches=['x86_64']
)
with self.assertRaises(RuntimeError) as ctx: with self.assertRaises(RuntimeError) as ctx:
pkgset.populate('f25') pkgset.populate('f25')
@ -309,8 +324,13 @@ class TestKojiPkgset(PkgsetCompareMixin, helpers.PungiTestCase):
'rpms/bash-debuginfo@4.3.42@4.fc24@x86_64', 'rpms/bash-debuginfo@4.3.42@4.fc24@x86_64',
]) ])
pkgset = pkgsets.KojiPackageSet(self.koji_wrapper, [None], pkgset = pkgsets.KojiPackageSet(
packages=["bash"], populate_only_packages=True) "pkgset",
self.koji_wrapper,
[None],
packages=["bash"],
populate_only_packages=True,
)
result = pkgset.populate('f25', logfile=self.topdir + '/pkgset.log') result = pkgset.populate('f25', logfile=self.topdir + '/pkgset.log')
@ -330,8 +350,13 @@ class TestKojiPkgset(PkgsetCompareMixin, helpers.PungiTestCase):
]) ])
cache_region = make_region().configure("dogpile.cache.memory") cache_region = make_region().configure("dogpile.cache.memory")
pkgset = pkgsets.KojiPackageSet(self.koji_wrapper, [None], arches=['x86_64'], pkgset = pkgsets.KojiPackageSet(
cache_region=cache_region) "pkgset",
self.koji_wrapper,
[None],
arches=['x86_64'],
cache_region=cache_region,
)
# Try calling the populate twice, but expect just single listTaggedRPMs # Try calling the populate twice, but expect just single listTaggedRPMs
# call - that means the caching worked. # call - that means the caching worked.
@ -352,8 +377,13 @@ class TestKojiPkgset(PkgsetCompareMixin, helpers.PungiTestCase):
]) ])
cache_region = make_region().configure("dogpile.cache.memory") cache_region = make_region().configure("dogpile.cache.memory")
pkgset = pkgsets.KojiPackageSet(self.koji_wrapper, [None], arches=['x86_64'], pkgset = pkgsets.KojiPackageSet(
cache_region=cache_region) "pkgset",
self.koji_wrapper,
[None],
arches=['x86_64'],
cache_region=cache_region,
)
# Try calling the populate twice with different event id. It must not # Try calling the populate twice with different event id. It must not
# cache anything. # cache anything.
@ -397,8 +427,8 @@ class TestKojiPkgset(PkgsetCompareMixin, helpers.PungiTestCase):
[b for b in self.tagged_rpms[1] if b["package_name"] != "pungi"]] [b for b in self.tagged_rpms[1] if b["package_name"] != "pungi"]]
pkgset = pkgsets.KojiPackageSet( pkgset = pkgsets.KojiPackageSet(
self.koji_wrapper, [None], "pkgset", self.koji_wrapper, [None], extra_builds=["pungi-4.1.3-3.fc25"]
extra_builds=["pungi-4.1.3-3.fc25"]) )
result = pkgset.populate('f25', logfile=self.topdir + '/pkgset.log') result = pkgset.populate('f25', logfile=self.topdir + '/pkgset.log')
@ -419,8 +449,8 @@ class TestKojiPkgset(PkgsetCompareMixin, helpers.PungiTestCase):
@mock.patch('kobo.pkgset.FileCache', new=MockFileCache) @mock.patch('kobo.pkgset.FileCache', new=MockFileCache)
class TestMergePackageSets(PkgsetCompareMixin, unittest.TestCase): class TestMergePackageSets(PkgsetCompareMixin, unittest.TestCase):
def test_merge_in_another_arch(self): def test_merge_in_another_arch(self):
first = pkgsets.PackageSetBase([None]) first = pkgsets.PackageSetBase("first", [None])
second = pkgsets.PackageSetBase([None]) second = pkgsets.PackageSetBase("second", [None])
for name in ['rpms/pungi@4.1.3@3.fc25@noarch', 'rpms/pungi@4.1.3@3.fc25@src']: for name in ['rpms/pungi@4.1.3@3.fc25@noarch', 'rpms/pungi@4.1.3@3.fc25@src']:
pkg = first.file_cache.add(name) pkg = first.file_cache.add(name)
@ -438,8 +468,8 @@ class TestMergePackageSets(PkgsetCompareMixin, unittest.TestCase):
'i686': ['rpms/bash@4.3.42@4.fc24@i686']}) 'i686': ['rpms/bash@4.3.42@4.fc24@i686']})
def test_merge_includes_noarch_with_different_exclude_arch(self): def test_merge_includes_noarch_with_different_exclude_arch(self):
first = pkgsets.PackageSetBase([None]) first = pkgsets.PackageSetBase("first", [None])
second = pkgsets.PackageSetBase([None]) second = pkgsets.PackageSetBase("second", [None])
pkg = first.file_cache.add('rpms/bash@4.3.42@4.fc24@i686') pkg = first.file_cache.add('rpms/bash@4.3.42@4.fc24@i686')
first.rpms_by_arch.setdefault(pkg.arch, []).append(pkg) first.rpms_by_arch.setdefault(pkg.arch, []).append(pkg)
@ -455,8 +485,8 @@ class TestMergePackageSets(PkgsetCompareMixin, unittest.TestCase):
'noarch': ['rpms/pungi@4.1.3@3.fc25@noarch']}) 'noarch': ['rpms/pungi@4.1.3@3.fc25@noarch']})
def test_merge_excludes_noarch_exclude_arch(self): def test_merge_excludes_noarch_exclude_arch(self):
first = pkgsets.PackageSetBase([None]) first = pkgsets.PackageSetBase("first", [None])
second = pkgsets.PackageSetBase([None]) second = pkgsets.PackageSetBase("second", [None])
pkg = first.file_cache.add('rpms/bash@4.3.42@4.fc24@i686') pkg = first.file_cache.add('rpms/bash@4.3.42@4.fc24@i686')
first.rpms_by_arch.setdefault(pkg.arch, []).append(pkg) first.rpms_by_arch.setdefault(pkg.arch, []).append(pkg)
@ -472,8 +502,8 @@ class TestMergePackageSets(PkgsetCompareMixin, unittest.TestCase):
'noarch': []}) 'noarch': []})
def test_merge_excludes_noarch_exclusive_arch(self): def test_merge_excludes_noarch_exclusive_arch(self):
first = pkgsets.PackageSetBase([None]) first = pkgsets.PackageSetBase("first", [None])
second = pkgsets.PackageSetBase([None]) second = pkgsets.PackageSetBase("second", [None])
pkg = first.file_cache.add('rpms/bash@4.3.42@4.fc24@i686') pkg = first.file_cache.add('rpms/bash@4.3.42@4.fc24@i686')
first.rpms_by_arch.setdefault(pkg.arch, []).append(pkg) first.rpms_by_arch.setdefault(pkg.arch, []).append(pkg)
@ -489,8 +519,8 @@ class TestMergePackageSets(PkgsetCompareMixin, unittest.TestCase):
'noarch': []}) 'noarch': []})
def test_merge_includes_noarch_with_same_exclusive_arch(self): def test_merge_includes_noarch_with_same_exclusive_arch(self):
first = pkgsets.PackageSetBase([None]) first = pkgsets.PackageSetBase("first", [None])
second = pkgsets.PackageSetBase([None]) second = pkgsets.PackageSetBase("second", [None])
pkg = first.file_cache.add('rpms/bash@4.3.42@4.fc24@i686') pkg = first.file_cache.add('rpms/bash@4.3.42@4.fc24@i686')
first.rpms_by_arch.setdefault(pkg.arch, []).append(pkg) first.rpms_by_arch.setdefault(pkg.arch, []).append(pkg)
@ -506,8 +536,8 @@ class TestMergePackageSets(PkgsetCompareMixin, unittest.TestCase):
'noarch': ['rpms/pungi@4.1.3@3.fc25@noarch']}) 'noarch': ['rpms/pungi@4.1.3@3.fc25@noarch']})
def test_merge_skips_package_in_cache(self): def test_merge_skips_package_in_cache(self):
first = pkgsets.PackageSetBase([None]) first = pkgsets.PackageSetBase("first", [None])
second = pkgsets.PackageSetBase([None]) second = pkgsets.PackageSetBase("second", [None])
pkg = first.file_cache.add('rpms/bash@4.3.42@4.fc24@i686') pkg = first.file_cache.add('rpms/bash@4.3.42@4.fc24@i686')
first.rpms_by_arch.setdefault(pkg.arch, []).append(pkg) first.rpms_by_arch.setdefault(pkg.arch, []).append(pkg)
@ -521,8 +551,8 @@ class TestMergePackageSets(PkgsetCompareMixin, unittest.TestCase):
{'i686': ['rpms/bash@4.3.42@4.fc24@i686']}) {'i686': ['rpms/bash@4.3.42@4.fc24@i686']})
def test_merge_skips_src_without_binary(self): def test_merge_skips_src_without_binary(self):
first = pkgsets.PackageSetBase([None]) first = pkgsets.PackageSetBase("first", [None])
second = pkgsets.PackageSetBase([None]) second = pkgsets.PackageSetBase("second", [None])
pkg = first.file_cache.add('rpms/bash@4.3.42@4.fc24@i686') pkg = first.file_cache.add('rpms/bash@4.3.42@4.fc24@i686')
first.rpms_by_arch.setdefault(pkg.arch, []).append(pkg) first.rpms_by_arch.setdefault(pkg.arch, []).append(pkg)
@ -548,7 +578,7 @@ class TestSaveFileList(unittest.TestCase):
os.unlink(self.tmpfile) os.unlink(self.tmpfile)
def test_save_arches_alphabetically(self): def test_save_arches_alphabetically(self):
pkgset = pkgsets.PackageSetBase([None]) pkgset = pkgsets.PackageSetBase("pkgset", [None])
for name in ['rpms/pungi@4.1.3@3.fc25@x86_64', for name in ['rpms/pungi@4.1.3@3.fc25@x86_64',
'rpms/pungi@4.1.3@3.fc25@src', 'rpms/pungi@4.1.3@3.fc25@src',
'rpms/pungi@4.1.3@3.fc25@ppc64']: 'rpms/pungi@4.1.3@3.fc25@ppc64']:
@ -564,7 +594,7 @@ class TestSaveFileList(unittest.TestCase):
'rpms/pungi@4.1.3@3.fc25@x86_64']) 'rpms/pungi@4.1.3@3.fc25@x86_64'])
def test_save_strip_prefix(self): def test_save_strip_prefix(self):
pkgset = pkgsets.PackageSetBase([None]) pkgset = pkgsets.PackageSetBase("pkgset", [None])
for name in ['rpms/pungi@4.1.3@3.fc25@noarch', 'rpms/pungi@4.1.3@3.fc25@src']: for name in ['rpms/pungi@4.1.3@3.fc25@noarch', 'rpms/pungi@4.1.3@3.fc25@src']:
pkg = pkgset.file_cache.add(name) pkg = pkgset.file_cache.add(name)
pkgset.rpms_by_arch.setdefault(pkg.arch, []).append(pkg) pkgset.rpms_by_arch.setdefault(pkg.arch, []).append(pkg)