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

store/compose/ImageType: use distro.ImageType objects

Browse source 
This reduces the amount of resolving and error checking we have to do.
This exposed a bug in weldr's ComposeEntry type, which will be fixed in
a follow-up commit.

Signed-off-by: Tom Gundersen <teg@jklm.no>
This commit is contained in:
Tom Gundersen 2020-05-11 22:54:28 +02:00
parent 5ba7e21a72
commit 2fe4450620
9 changed files with 77 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

27
internal/store/fixtures.go
View file

@ -6,6 +6,7 @@ import (
"github.com/google/uuid"
"github.com/osbuild/osbuild-composer/internal/blueprint"
"github.com/osbuild/osbuild-composer/internal/common"
test_distro "github.com/osbuild/osbuild-composer/internal/distro/fedoratest"
"github.com/osbuild/osbuild-composer/internal/target"
)
@ -46,7 +47,16 @@ func FixtureBase() *Store {
},
}
s := New(nil)
d := test_distro.New()
arch, err := d.GetArch("x86_64")
if err != nil {
panic("invalid architecture x86_64 for fedoratest")
}
imgType, err := arch.GetImageType("qcow2")
if err != nil {
panic("invalid image type qcow2 for x86_64 @ fedoratest")
}
s := New(nil, arch)
s.blueprints[bName] = b
s.composes = map[uuid.UUID]Compose{
@ -55,7 +65,7 @@ func FixtureBase() *Store {
ImageBuilds: []ImageBuild{
{
QueueStatus: common.IBWaiting,
ImageType: common.Qcow2Generic,
ImageType: imgType,
Targets: []*target.Target{localTarget, awsTarget},
JobCreated: date,
},
@ -66,7 +76,7 @@ func FixtureBase() *Store {
ImageBuilds: []ImageBuild{
{
QueueStatus: common.IBRunning,
ImageType: common.Qcow2Generic,
ImageType: imgType,
Targets: []*target.Target{localTarget},
JobCreated: date,
JobStarted: date,
@ -78,7 +88,7 @@ func FixtureBase() *Store {
ImageBuilds: []ImageBuild{
{
QueueStatus: common.IBFinished,
ImageType: common.Qcow2Generic,
ImageType: imgType,
Targets: []*target.Target{localTarget, awsTarget},
JobCreated: date,
JobStarted: date,
@ -91,7 +101,7 @@ func FixtureBase() *Store {
ImageBuilds: []ImageBuild{
{
QueueStatus: common.IBFailed,
ImageType: common.Qcow2Generic,
ImageType: imgType,
Targets: []*target.Target{localTarget, awsTarget},
JobCreated: date,
JobStarted: date,
@ -115,7 +125,12 @@ func FixtureEmpty() *Store {
Customizations: nil,
}
s := New(nil)
d := test_distro.New()
arch, err := d.GetArch("x86_64")
if err != nil {
panic("invalid architecture x86_64 for fedoratest")
}
s := New(nil, arch)
s.blueprints[bName] = b