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

rpmmd: move RPM metadata tooling to internal pkg

Browse source 
Move the OSBuildStagesToRPMs function, associated test, and RPM type
from the worker into the rpmmd subpackge. We will use this function in
the cloud API to compile the NEVRAs for the new metadata endpoint.
This commit is contained in:
Achilleas Koutsou 2021-06-21 13:46:59 +02:00 • committed by Tom Gundersen
parent b1e40b5ce7
commit 6b3920783f
7 changed files with 75 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -8,6 +8,7 @@ import (
"net/url"
"time"
"github.com/osbuild/osbuild-composer/internal/rpmmd"
"github.com/osbuild/osbuild-composer/internal/upload/koji"
"github.com/osbuild/osbuild-composer/internal/worker"
)
@ -146,7 +147,7 @@ func (impl *KojiFinalizeJobImpl) Run(job worker.Job) error {
Arch: buildArgs.Arch,
},
Tools: []koji.Tool{},
RPMs: osbuildStagesToRPMs(buildArgs.OSBuildOutput.Build.Stages),
RPMs: rpmmd.OSBuildStagesToRPMs(buildArgs.OSBuildOutput.Build.Stages),
})
images = append(images, koji.Image{
BuildRootID: uint64(i),
@ -156,7 +157,7 @@ func (impl *KojiFinalizeJobImpl) Run(job worker.Job) error {
ChecksumType: "md5",
MD5: buildArgs.ImageHash,
Type: "image",
RPMs: osbuildStagesToRPMs(buildArgs.OSBuildOutput.Stages),
RPMs: rpmmd.OSBuildStagesToRPMs(buildArgs.OSBuildOutput.Stages),
Extra: koji.ImageExtra{
Info: koji.ImageExtraInfo{
Arch: buildArgs.Arch,