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

Worker/koji-finalize: include composer and deps version in manifest MD

Browse source 
Include the osbuild-composer and its dependencies versions in the extra
metadata associated with the Manifest output when importing it to Koji.

This will make it possible to pin-point the exact version combination
which was used to generate the osbuild manifest used to built the image
imported to Koji.

Signed-off-by: Tomáš Hozza <thozza@redhat.com>
This commit is contained in:
Tomáš Hozza 2023-09-22 10:14:40 +02:00 • committed by Tomáš Hozza
parent 285cd30af2
commit c27cf0253d
2 changed files with 42 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -225,6 +225,30 @@ func (impl *KojiFinalizeJobImpl) Run(job worker.Job) error {
// TODO: Condition below is present for backward compatibility with old workers which don't upload the manifest.
// TODO: Remove the condition it in the future.
if kojiTargetOptions.OSBuildManifest != nil {
manifestExtraInfo := koji.ManifestExtraInfo{
Arch: buildResult.Arch,
}
if kojiTargetOptions.OSBuildManifestInfo != nil {
manifestInfo := &koji.ManifestInfo{
OSBuildComposerVersion: kojiTargetOptions.OSBuildManifestInfo.OSBuildComposerVersion,
}
for _, composerDep := range kojiTargetOptions.OSBuildManifestInfo.OSBuildComposerDeps {
dep := &koji.OSBuildComposerDepModule{
Path: composerDep.Path,
Version: composerDep.Version,
}
if composerDep.Replace != nil {
dep.Replace = &koji.OSBuildComposerDepModule{
Path: composerDep.Replace.Path,
Version: composerDep.Replace.Version,
}
}
manifestInfo.OSBuildComposerDeps = append(manifestInfo.OSBuildComposerDeps, dep)
}
manifestExtraInfo.Info = manifestInfo
}
outputs = append(outputs, koji.BuildOutput{
BuildRootID: uint64(i),
Filename: kojiTargetOptions.OSBuildManifest.Filename,
@ -234,9 +258,7 @@ func (impl *KojiFinalizeJobImpl) Run(job worker.Job) error {
Checksum: kojiTargetOptions.OSBuildManifest.Checksum,
Type: koji.BuildOutputTypeManifest,
Extra: &koji.BuildOutputExtra{
ImageOutput: koji.ManifestExtraInfo{
Arch: buildResult.Arch,
},
ImageOutput: manifestExtraInfo,
},
})
}

21
internal/upload/koji/koji.go
View file

@ -130,12 +130,25 @@ type ImageExtraInfo struct {
func (ImageExtraInfo) isImageOutputTypeMD() {}
type OSBuildComposerDepModule struct {
Path string `json:"path"`
Version string `json:"version"`
Replace *OSBuildComposerDepModule `json:"replace,omitempty"`
}
// ManifestInfo holds information about the environment in which
// the manifest was produced and which could affect its content.
type ManifestInfo struct {
OSBuildComposerVersion string `json:"osbuild_composer_version"`
// List of relevant modules used by osbuild-composer which
// could affect the manifest content.
OSBuildComposerDeps []*OSBuildComposerDepModule `json:"osbuild_composer_deps,omitempty"`
}
// ManifestExtraInfo holds extra metadata about the osbuild manifest.
type ManifestExtraInfo struct {
// TODO: include osbuild-composer version which produced the manifest?
// TODO: include the vendored 'images' version?
Arch string `json:"arch"`
Arch string `json:"arch"`
Info *ManifestInfo `json:"info,omitempty"`
}
func (ManifestExtraInfo) isImageOutputTypeMD() {}