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

upload/koji: don't depend on upload target osbuild artifact structure

Browse source 
Modify the Koji image extra metadata to not depend on the upload target
data structure for the OSBuild Artifact. This is the last dependency on
the internal osbuild-composer package, allowing the move of the Koji
upload code to the osbuild/images repository.

Signed-off-by: Tomáš Hozza <thozza@redhat.com>
This commit is contained in:
Tomáš Hozza 2025-07-07 16:15:15 +02:00 • committed by Tomáš Hozza
parent 2ceffb3796
commit 651946ae54
2 changed files with 19 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
cmd/osbuild-worker/jobimpl-koji-finalize.go
View file

@ -160,6 +160,14 @@ func (impl *KojiFinalizeJobImpl) Run(job worker.Job) error {
}
kojiTargetResult := kojiTargetResults[0]
var kojiTargetOSBuildArtifact *koji.OsbuildArtifact
if kojiTargetResult.OsbuildArtifact != nil {
kojiTargetOSBuildArtifact = &koji.OsbuildArtifact{
ExportFilename: kojiTargetResult.OsbuildArtifact.ExportFilename,
ExportName: kojiTargetResult.OsbuildArtifact.ExportName,
}
}
kojiTargetOptions := kojiTargetResult.Options.(*target.KojiTargetResultOptions)
buildRoots = append(buildRoots, koji.BuildRoot{
@ -193,7 +201,7 @@ func (impl *KojiFinalizeJobImpl) Run(job worker.Job) error {
imgOutputExtraInfo := koji.ImageExtraInfo{
Arch: buildResult.Arch,
BootMode: buildResult.ImageBootMode,
OSBuildArtifact: kojiTargetResult.OsbuildArtifact,
OSBuildArtifact: kojiTargetOSBuildArtifact,
OSBuildVersion: buildResult.OSBuildVersion,
}