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

switch to images/pkg/dnfjson and remove internal copy

Browse source 
COMPOSER-2068
This commit is contained in:
Diaa Sami 2023-11-30 11:19:41 +01:00 • committed by Tomáš Hozza
parent 98e3dab9c7
commit 76e686df10
23 changed files with 120 additions and 1158 deletions
Download patch file Download diff file Expand all files Collapse all files

3
cmd/gen-manifests/main.go
View file

@ -27,7 +27,7 @@ import (
"github.com/osbuild/images/pkg/rhsm/facts"
"github.com/osbuild/images/pkg/rpmmd"
"github.com/osbuild/osbuild-composer/internal/dnfjson"
"github.com/osbuild/images/pkg/dnfjson"
)
type multiValue []string
@ -323,7 +323,6 @@ func resolvePipelineCommits(commitSources map[string][]ostree.SourceSpec) map[st
func depsolve(cacheDir string, packageSets map[string][]rpmmd.PackageSet, d distro.Distro, arch string) (map[string][]rpmmd.PackageSpec, error) {
solver := dnfjson.NewSolver(d.ModulePlatformID(), d.Releasever(), arch, d.Name(), cacheDir)
solver.SetDNFJSONPath("./dnf-json")
depsolvedSets := make(map[string][]rpmmd.PackageSpec)
for name, pkgSet := range packageSets {
res, err := solver.Depsolve(pkgSet)

2
cmd/mock-dnf-json/dnf-json.go
View file

@ -16,7 +16,7 @@ import (
"os"
"strings"
"github.com/osbuild/osbuild-composer/internal/dnfjson"
"github.com/osbuild/images/pkg/dnfjson"
)
func maybeFail(err error) {

2
cmd/osbuild-composer/composer.go
View file

@ -22,10 +22,10 @@ import (
"github.com/osbuild/osbuild-composer/pkg/jobqueue/dbjobqueue"
"github.com/osbuild/images/pkg/distrofactory"
"github.com/osbuild/images/pkg/dnfjson"
"github.com/osbuild/osbuild-composer/internal/auth"
"github.com/osbuild/osbuild-composer/internal/cloudapi"
v2 "github.com/osbuild/osbuild-composer/internal/cloudapi/v2"
"github.com/osbuild/osbuild-composer/internal/dnfjson"
"github.com/osbuild/osbuild-composer/internal/jobqueue/fsjobqueue"
"github.com/osbuild/osbuild-composer/internal/weldr"
"github.com/osbuild/osbuild-composer/internal/worker"

2
cmd/osbuild-composer/config.go
View file

@ -126,7 +126,7 @@ func GetDefaultConfig() *ComposerConfigFile {
},
LogLevel: "info",
LogFormat: "text",
DNFJson: "/usr/libexec/osbuild-composer/dnf-json",
DNFJson: "/usr/libexec/osbuild-depsolve-dnf",
}
}

2
cmd/osbuild-dnf-json-tests/main_test.go
View file

@ -14,10 +14,10 @@ import (
"github.com/osbuild/images/pkg/blueprint"
"github.com/osbuild/images/pkg/distro"
"github.com/osbuild/images/pkg/distro/rhel9"
"github.com/osbuild/images/pkg/dnfjson"
"github.com/osbuild/images/pkg/ostree"
"github.com/osbuild/images/pkg/reporegistry"
"github.com/osbuild/images/pkg/rpmmd"
"github.com/osbuild/osbuild-composer/internal/dnfjson"
)
// This test loads all the repositories available in /repositories directory

2
cmd/osbuild-store-dump/main.go
View file

@ -13,11 +13,11 @@ import (
"github.com/osbuild/images/pkg/distro"
"github.com/osbuild/images/pkg/distro/fedora"
"github.com/osbuild/images/pkg/distrofactory"
"github.com/osbuild/images/pkg/dnfjson"
"github.com/osbuild/images/pkg/manifest"
"github.com/osbuild/images/pkg/reporegistry"
"github.com/osbuild/images/pkg/rpmmd"
"github.com/osbuild/osbuild-composer/internal/blueprint"
"github.com/osbuild/osbuild-composer/internal/dnfjson"
"github.com/osbuild/osbuild-composer/internal/store"
"github.com/osbuild/osbuild-composer/internal/target"
)

4
cmd/osbuild-worker/config_test.go
View file

@ -19,7 +19,7 @@ func Test_parseConfig(t *testing.T) {
config: `
# comment
base_path = "/api/image-builder-worker/v1"
dnf-json = "/usr/libexec/dnf-json"
dnf-json = "/usr/libexec/osbuild-depsolve-dnf"
[composer]
proxy = "http://proxy.example.com"
@ -72,7 +72,7 @@ server_address = "https://example.com/pulp"
`,
want: &workerConfig{
BasePath: "/api/image-builder-worker/v1",
DNFJson: "/usr/libexec/dnf-json",
DNFJson: "/usr/libexec/osbuild-depsolve-dnf",
OSBuildExecutor: &executorConfig{
Type: "host",
},

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

@ -5,8 +5,8 @@ import (
"github.com/sirupsen/logrus"
"github.com/osbuild/images/pkg/dnfjson"
"github.com/osbuild/images/pkg/rpmmd"
"github.com/osbuild/osbuild-composer/internal/dnfjson"
"github.com/osbuild/osbuild-composer/internal/worker"
"github.com/osbuild/osbuild-composer/internal/worker/clienterrors"
)

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

@ -21,7 +21,7 @@ import (
"github.com/sirupsen/logrus"
"github.com/osbuild/images/pkg/arch"
"github.com/osbuild/osbuild-composer/internal/dnfjson"
"github.com/osbuild/images/pkg/dnfjson"
"github.com/osbuild/osbuild-composer/internal/upload/azure"
"github.com/osbuild/osbuild-composer/internal/upload/koji"
"github.com/osbuild/osbuild-composer/internal/upload/oci"