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

distro: remove architecture names and use platform enum

Browse source 
Removing the dependence of the manifest package on the distro package to
import manifest into distro.
Wherever arch names are needed, we use the enums from the platform
package instead.
This commit is contained in:
Achilleas Koutsou 2023-04-27 14:25:47 +02:00 • committed by Simon de Vlieger
parent 0f925c445c
commit 8f69088af1
31 changed files with 108 additions and 101 deletions
Download patch file Download diff file Expand all files Collapse all files

5
internal/worker/server_test.go
View file

@ -20,6 +20,7 @@ import (
"github.com/osbuild/osbuild-composer/internal/distro/test_distro"
"github.com/osbuild/osbuild-composer/internal/jobqueue/fsjobqueue"
"github.com/osbuild/osbuild-composer/internal/osbuild"
"github.com/osbuild/osbuild-composer/internal/platform"
"github.com/osbuild/osbuild-composer/internal/rpmmd"
"github.com/osbuild/osbuild-composer/internal/target"
"github.com/osbuild/osbuild-composer/internal/test"
@ -737,7 +738,7 @@ func enqueueAndFinishTestJobDependencies(s *worker.Server, deps []testJob) ([]uu
switch dep.main.(type) {
case *worker.OSBuildJob:
job := dep.main.(*worker.OSBuildJob)
id, err = s.EnqueueOSBuildAsDependency(distro.X86_64ArchName, job, depUUIDs, "")
id, err = s.EnqueueOSBuildAsDependency(platform.ARCH_X86_64.String(), job, depUUIDs, "")
if err != nil {
return nil, err
}
@ -807,7 +808,7 @@ func enqueueAndFinishTestJobDependencies(s *worker.Server, deps []testJob) ([]uu
}
// request the previously added Job
_, token, _, _, _, err := s.RequestJobById(context.Background(), distro.X86_64ArchName, id)
_, token, _, _, _, err := s.RequestJobById(context.Background(), platform.ARCH_X86_64.String(), id)
if err != nil {
return nil, err
}