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

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"