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

Koji: refactor and consolidate structures

Browse source 
The original Koji implementation expected that the output of a content
generator is only an image. While in reality, we will eventually upload
other types of files as outputs to Koji, such as logs and osbuild
manifest.

Rename Koji structures and their members to better map to the upstream
Koji documentation and their JSON representation. Add comments to
structures. Define type aliases and constants for string values which
are more like enums, than a free-form values.

These changes have no effect on the actual JSON representation of any of
the structures

Signed-off-by: Tomáš Hozza <thozza@redhat.com>
This commit is contained in:
Tomáš Hozza 2023-08-01 17:23:33 +02:00 • committed by Ondřej Budai
parent 1b04a78120
commit 350762497f
4 changed files with 105 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -21,9 +21,9 @@ type KojiFinalizeJobImpl struct {
func (impl *KojiFinalizeJobImpl) kojiImport(
server string,
build koji.ImageBuild,
build koji.Build,
buildRoots []koji.BuildRoot,
images []koji.Image,
outputs []koji.BuildOutput,
directory, token string) error {
serverURL, err := url.Parse(server)
@ -48,7 +48,7 @@ func (impl *KojiFinalizeJobImpl) kojiImport(
}
}()
_, err = k.CGImport(build, buildRoots, images, directory, token)
_, err = k.CGImport(build, buildRoots, outputs, directory, token)
if err != nil {
return fmt.Errorf("Could not import build into koji: %v", err)
}
@ -115,7 +115,7 @@ func (impl *KojiFinalizeJobImpl) Run(job worker.Job) error {
return err
}
build := koji.ImageBuild{
build := koji.Build{
TaskID: args.TaskID,
Name: args.Name,
Version: args.Version,
@ -125,7 +125,7 @@ func (impl *KojiFinalizeJobImpl) Run(job worker.Job) error {
}
var buildRoots []koji.BuildRoot
var images []koji.Image
var outputs []koji.BuildOutput
var osbuildResults []worker.OSBuildJobResult
initArgs, osbuildResults, err = extractDynamicArgs(job)
@ -191,24 +191,24 @@ func (impl *KojiFinalizeJobImpl) Run(job worker.Job) error {
// deduplicate
imageRPMs = rpmmd.DeduplicateRPMs(imageRPMs)
images = append(images, koji.Image{
outputs = append(outputs, koji.BuildOutput{
BuildRootID: uint64(i),
Filename: args.KojiFilenames[i],
FileSize: kojiTargetOptions.ImageSize,
Arch: buildArgs.Arch,
ChecksumType: "md5",
MD5: kojiTargetOptions.ImageMD5,
Type: "image",
ChecksumType: koji.ChecksumTypeMD5,
Checksum: kojiTargetOptions.ImageMD5,
Type: koji.BuildOutputTypeImage,
RPMs: imageRPMs,
Extra: koji.ImageExtra{
Info: koji.ImageExtraInfo{
Extra: koji.BuildOutputExtra{
Image: koji.ImageExtraInfo{
Arch: buildArgs.Arch,
},
},
})
}
err = impl.kojiImport(args.Server, build, buildRoots, images, args.KojiDirectory, initArgs.Token)
err = impl.kojiImport(args.Server, build, buildRoots, outputs, args.KojiDirectory, initArgs.Token)
if err != nil {
kojiFinalizeJobResult.JobError = clienterrors.WorkerClientError(clienterrors.ErrorKojiFinalize, err.Error(), nil)
return err