particle-os/debian-koji
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

PR#2548: kojira: don't expire ignored tags with targets

Browse source 
Merges #2548
https://pagure.io/koji/pull-request/2548

Fixes: #2542
https://pagure.io/koji/issue/2542
kojira will expire repos for ignored tags
This commit is contained in:
Tomas Kopecek 2020-10-29 15:12:03 +01:00
commit 88ad6854da
1 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

18
util/kojira
View file

@ -780,16 +780,20 @@ class RepoManager(object):
n_need = len(self.needed_tags)
ignore = self.options.ignore_tags.split()
self.build_tags = set([
t['build_tag'] for t in self.session.getBuildTargets()
if not koji.util.multi_fnmatch(t['build_tag_name'], ignore)
])
build_tags = set()
ignored_build_tags = set()
for t in self.session.getBuildTargets():
if koji.util.multi_fnmatch(t['build_tag_name'], ignore):
ignored_build_tags.add(t['build_tag'])
else:
build_tags.add(t['build_tag'])
# index repos by tag
tag_repos = {}
for repo in to_list(self.repos.values()):
tag_repos.setdefault(repo.tag_id, []).append(repo)
for tag_id in self.build_tags:
for tag_id in build_tags:
covered = False
for repo in tag_repos.get(tag_id, []):
if repo.current:
@ -841,12 +845,12 @@ class RepoManager(object):
# some cleanup
for tag_id in list(self.needed_tags):
entry = self.needed_tags.get(tag_id)
if tag_id not in self.build_tags:
if tag_id not in build_tags:
self.logger.info("Tag %(name)s is no longer a build tag",
entry['taginfo'])
del self.needed_tags[tag_id]
for tag_id, repolist in tag_repos.items():
if tag_id not in self.build_tags:
if tag_id not in build_tags and tag_id not in ignored_build_tags:
# repos for these tags are no longer required
for repo in repolist:
if repo.ready():