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

osbuild-worker: Recreate rpmmd for each depsolve

Browse source 
The remote workers are long-running, and the subscription certificates
might expire. Before each depsolve refresh the subscriptions.
This commit is contained in:
sanne 2021-11-25 11:24:00 +01:00 • committed by Ondřej Budai
parent 14b29ae98a
commit c6c311cc3d
2 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
cmd/osbuild-worker/jobimpl-depsolve.go
View file

@ -8,13 +8,15 @@ import (
)
type DepsolveJobImpl struct {
RPMMD rpmmd.RPMMD
RPMMDCache string
}
func (impl *DepsolveJobImpl) depsolve(packageSets map[string]rpmmd.PackageSet, repos []rpmmd.RepoConfig, modulePlatformID, arch, releasever string) (map[string][]rpmmd.PackageSpec, error) {
rpmMD := rpmmd.NewRPMMD(impl.RPMMDCache, "/usr/libexec/osbuild-composer/dnf-json")
packageSpecs := make(map[string][]rpmmd.PackageSpec)
for name, packageSet := range packageSets {
packageSpec, _, err := impl.RPMMD.Depsolve(packageSet, repos, modulePlatformID, arch, releasever)
packageSpec, _, err := rpmMD.Depsolve(packageSet, repos, modulePlatformID, arch, releasever)
if err != nil {
return nil, err
}

3
cmd/osbuild-worker/main.go
View file

@ -17,7 +17,6 @@ import (
"github.com/sirupsen/logrus"
"github.com/osbuild/osbuild-composer/internal/common"
"github.com/osbuild/osbuild-composer/internal/rpmmd"
"github.com/osbuild/osbuild-composer/internal/upload/azure"
"github.com/osbuild/osbuild-composer/internal/upload/koji"
"github.com/osbuild/osbuild-composer/internal/worker"
@ -287,7 +286,7 @@ func main() {
go func() {
jobImpls := map[string]JobImplementation{
"depsolve": &DepsolveJobImpl{
RPMMD: rpmmd.NewRPMMD(rpmmd_cache, "/usr/libexec/osbuild-composer/dnf-json"),
RPMMDCache: rpmmd_cache,
},
}
acceptedJobTypes := []string{}