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

distro: load ostree parameters from test manifest if specified

Browse source 
If the compose request in the test manifest contains ostree parameters,
add them to the test.
This commit is contained in:
Achilleas Koutsou 2022-02-24 17:14:33 +01:00 • committed by Tom Gundersen
parent ccd0be8c34
commit 0a535ab09e
1 changed files with 15 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

24
internal/distro/distro_test_common/distro_test_common.go
View file

@ -35,11 +35,12 @@ func TestDistro_Manifest(t *testing.T, pipelinePath string, prefix string, regis
CheckGPG bool `json:"check_gpg,omitempty"`
}
type composeRequest struct {
Distro string `json:"distro"`
Arch string `json:"arch"`
ImageType string `json:"image-type"`
Repositories []repository `json:"repositories"`
Blueprint *blueprint.Blueprint `json:"blueprint"`
Distro string `json:"distro"`
Arch string `json:"arch"`
ImageType string `json:"image-type"`
Repositories []repository `json:"repositories"`
Blueprint *blueprint.Blueprint `json:"blueprint"`
OSTree *ostree.RequestParams `json:"ostree"`
}
var tt struct {
ComposeRequest *composeRequest `json:"compose-request"`
@ -101,12 +102,17 @@ func TestDistro_Manifest(t *testing.T, pipelinePath string, prefix string, regis
imgPackageSpecSets = tt.PackageSpecSets
}
ostreeOptions := ostree.RequestParams{
Ref: imageType.OSTreeRef(),
}
if tt.ComposeRequest.OSTree != nil {
ostreeOptions = *tt.ComposeRequest.OSTree
}
got, err := imageType.Manifest(tt.ComposeRequest.Blueprint.Customizations,
distro.ImageOptions{
Size: imageType.Size(0),
OSTree: ostree.RequestParams{
Ref: imageType.OSTreeRef(),
},
Size: imageType.Size(0),
OSTree: ostreeOptions,
},
repos,
imgPackageSpecSets,