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

let tag.extra override tag arches for noarch

Browse source
This commit is contained in:
Mike McLean 2024-02-13 19:26:08 -05:00 • committed by Tomas Kopecek
parent 2bd42517d3
commit a451226b48
1 changed files with 15 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

20
builder/kojid
View file

@ -1436,23 +1436,33 @@ class BuildTask(BaseTaskHandler):
exclusivearch = koji.get_header_field(h, 'exclusivearch') exclusivearch = koji.get_header_field(h, 'exclusivearch')
excludearch = koji.get_header_field(h, 'excludearch') excludearch = koji.get_header_field(h, 'excludearch')
if exclusivearch or excludearch: buildconfig = self.session.getBuildConfig(build_tag, event=self.event_id)
noarch_arches = buildconfig.get('extra', {}).get('noarch_arches')
if exclusivearch or excludearch or noarch_arches:
# if one of the tag arches is filtered out, then we can't use a # if one of the tag arches is filtered out, then we can't use a
# noarch task # noarch task
buildconfig = self.session.getBuildConfig(build_tag, event=self.event_id)
arches = buildconfig['arches'] arches = buildconfig['arches']
tag_arches = [koji.canonArch(a) for a in arches.split()] tag_arches = [koji.canonArch(a) for a in arches.split()]
exclusivearch = [koji.canonArch(a) for a in exclusivearch] exclusivearch = [koji.canonArch(a) for a in exclusivearch]
excludearch = [koji.canonArch(a) for a in excludearch] excludearch = [koji.canonArch(a) for a in excludearch]
archlist = list(tag_arches) # tag.extra overrides tag arches for noarch
if noarch_arches:
archlist = [koji.canonArch(a) for a in noarch_arches.split()]
archlist = [a for a in archlist if a in tag_arches]
else:
archlist = list(tag_arches)
if exclusivearch: if exclusivearch:
archlist = [a for a in archlist if a in exclusivearch] archlist = [a for a in archlist if a in exclusivearch]
if excludearch: if excludearch:
archlist = [a for a in archlist if a not in excludearch] archlist = [a for a in archlist if a not in excludearch]
self.logger.info('Filtering arches for noarch subtask. Choices: %r', archlist)
if not archlist: if not archlist:
raise koji.BuildError("No valid arches were found. tag %r, " raise koji.BuildError("No valid arches were found. tag %r, extra %r,"
"exclusive %r, exclude %r" % (tag_arches, "exclusive %r, exclude %r" % (tag_arches, noarch_arches,
exclusivearch, excludearch)) exclusivearch, excludearch))
self.logger.debug('tag: %r, extra: %r, exclusive: %r, exclude: %r',
tag_arches, noarch_arches, exclusivearch, excludearch)
if set(archlist) != set(tag_arches): if set(archlist) != set(tag_arches):
return random.choice(archlist) return random.choice(archlist)
else: else: