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

distro/fedora: use GetTestingImagePackageSpecSets() and remove references to "centos"

Browse source
This commit is contained in:
Jordi Gil 2022-05-02 21:08:31 -04:00 • committed by Tomáš Hozza
parent 5936abf85e
commit dbd163d49c
1 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

22
internal/distro/fedora/distro_test.go
View file

@ -195,14 +195,13 @@ func TestImageType_BuildPackages(t *testing.T) {
"dnf", "dnf",
"dosfstools", "dosfstools",
"e2fsprogs", "e2fsprogs",
"grub2-efi-x64",
"grub2-pc",
"policycoreutils", "policycoreutils",
"shim-x64", "qemu-img",
"selinux-policy-targeted",
"systemd", "systemd",
"tar", "tar",
"qemu-img",
"xz", "xz",
"grub2-pc",
} }
aarch64BuildPackages := []string{ aarch64BuildPackages := []string{
"dnf", "dnf",
@ -210,6 +209,7 @@ func TestImageType_BuildPackages(t *testing.T) {
"e2fsprogs", "e2fsprogs",
"policycoreutils", "policycoreutils",
"qemu-img", "qemu-img",
"selinux-policy-targeted",
"systemd", "systemd",
"tar", "tar",
"xz", "xz",
@ -276,13 +276,13 @@ func TestImageType_Name(t *testing.T) {
for _, dist := range fedoraFamilyDistros { for _, dist := range fedoraFamilyDistros {
t.Run(dist.name, func(t *testing.T) { t.Run(dist.name, func(t *testing.T) {
for _, mapping := range imgMap { for _, mapping := range imgMap {
if mapping.arch == "s390x" && dist.name == "centos" { if mapping.arch == "s390x" {
continue continue
} }
arch, err := dist.distro.GetArch(mapping.arch) arch, err := dist.distro.GetArch(mapping.arch)
if assert.NoError(t, err) { if assert.NoError(t, err) {
for _, imgName := range mapping.imgNames { for _, imgName := range mapping.imgNames {
if imgName == "fedora-iot-commit" && dist.name == "centos" { if imgName == "fedora-iot-commit" {
continue continue
} }
imgType, err := arch.GetImageType(imgName) imgType, err := arch.GetImageType(imgName)
@ -394,7 +394,7 @@ func TestDistro_ManifestError(t *testing.T) {
imgOpts := distro.ImageOptions{ imgOpts := distro.ImageOptions{
Size: imgType.Size(0), Size: imgType.Size(0),
} }
testPackageSpecSets := distro_test_common.GetTestingPackageSpecSets("kernel", arch.Name(), imgType.PayloadPackageSets()) testPackageSpecSets := distro_test_common.GetTestingImagePackageSpecSets("kernel", imgType)
_, err := imgType.Manifest(bp.Customizations, imgOpts, nil, testPackageSpecSets, 0) _, err := imgType.Manifest(bp.Customizations, imgOpts, nil, testPackageSpecSets, 0)
if imgTypeName == "fedora-iot-commit" || imgTypeName == "fedora-iot-container" { if imgTypeName == "fedora-iot-commit" || imgTypeName == "fedora-iot-container" {
assert.EqualError(t, err, "kernel boot parameter customizations are not supported for ostree types") assert.EqualError(t, err, "kernel boot parameter customizations are not supported for ostree types")
@ -555,7 +555,7 @@ func TestDistro_TestRootMountPoint(t *testing.T) {
arch, _ := fedoraDistro.GetArch(archName) arch, _ := fedoraDistro.GetArch(archName)
for _, imgTypeName := range arch.ListImageTypes() { for _, imgTypeName := range arch.ListImageTypes() {
imgType, _ := arch.GetImageType(imgTypeName) imgType, _ := arch.GetImageType(imgTypeName)
testPackageSpecSets := distro_test_common.GetTestingPackageSpecSets("kernel", arch.Name(), imgType.PayloadPackageSets()) testPackageSpecSets := distro_test_common.GetTestingImagePackageSpecSets("kernel", imgType)
_, err := imgType.Manifest(bp.Customizations, distro.ImageOptions{}, nil, testPackageSpecSets, 0) _, err := imgType.Manifest(bp.Customizations, distro.ImageOptions{}, nil, testPackageSpecSets, 0)
if imgTypeName == "fedora-iot-commit" || imgTypeName == "fedora-iot-container" { if imgTypeName == "fedora-iot-commit" || imgTypeName == "fedora-iot-container" {
assert.EqualError(t, err, "Custom mountpoints are not supported for ostree types") assert.EqualError(t, err, "Custom mountpoints are not supported for ostree types")
@ -588,7 +588,7 @@ func TestDistro_CustomFileSystemSubDirectories(t *testing.T) {
arch, _ := fedoraDistro.GetArch(archName) arch, _ := fedoraDistro.GetArch(archName)
for _, imgTypeName := range arch.ListImageTypes() { for _, imgTypeName := range arch.ListImageTypes() {
imgType, _ := arch.GetImageType(imgTypeName) imgType, _ := arch.GetImageType(imgTypeName)
testPackageSpecSets := distro_test_common.GetTestingPackageSpecSets("kernel", arch.Name(), imgType.PayloadPackageSets()) testPackageSpecSets := distro_test_common.GetTestingImagePackageSpecSets("kernel", imgType)
_, err := imgType.Manifest(bp.Customizations, distro.ImageOptions{}, nil, testPackageSpecSets, 0) _, err := imgType.Manifest(bp.Customizations, distro.ImageOptions{}, nil, testPackageSpecSets, 0)
if strings.HasPrefix(imgTypeName, "fedora-iot-") { if strings.HasPrefix(imgTypeName, "fedora-iot-") {
continue continue
@ -627,7 +627,7 @@ func TestDistro_MountpointsWithArbitraryDepthAllowed(t *testing.T) {
arch, _ := fedoraDistro.GetArch(archName) arch, _ := fedoraDistro.GetArch(archName)
for _, imgTypeName := range arch.ListImageTypes() { for _, imgTypeName := range arch.ListImageTypes() {
imgType, _ := arch.GetImageType(imgTypeName) imgType, _ := arch.GetImageType(imgTypeName)
testPackageSpecSets := distro_test_common.GetTestingPackageSpecSets("kernel", arch.Name(), imgType.PayloadPackageSets()) testPackageSpecSets := distro_test_common.GetTestingImagePackageSpecSets("kernel", imgType)
_, err := imgType.Manifest(bp.Customizations, distro.ImageOptions{}, nil, testPackageSpecSets, 0) _, err := imgType.Manifest(bp.Customizations, distro.ImageOptions{}, nil, testPackageSpecSets, 0)
if strings.HasPrefix(imgTypeName, "fedora-iot-") { if strings.HasPrefix(imgTypeName, "fedora-iot-") {
continue continue
@ -720,7 +720,7 @@ func TestDistro_CustomUsrPartitionNotLargeEnough(t *testing.T) {
arch, _ := fedoraDistro.GetArch(archName) arch, _ := fedoraDistro.GetArch(archName)
for _, imgTypeName := range arch.ListImageTypes() { for _, imgTypeName := range arch.ListImageTypes() {
imgType, _ := arch.GetImageType(imgTypeName) imgType, _ := arch.GetImageType(imgTypeName)
testPackageSpecSets := distro_test_common.GetTestingPackageSpecSets("kernel", arch.Name(), imgType.PayloadPackageSets()) testPackageSpecSets := distro_test_common.GetTestingImagePackageSpecSets("kernel", imgType)
_, err := imgType.Manifest(bp.Customizations, distro.ImageOptions{}, nil, testPackageSpecSets, 0) _, err := imgType.Manifest(bp.Customizations, distro.ImageOptions{}, nil, testPackageSpecSets, 0)
if imgTypeName == "fedora-iot-commit" || imgTypeName == "fedora-iot-container" { if imgTypeName == "fedora-iot-commit" || imgTypeName == "fedora-iot-container" {
assert.EqualError(t, err, "Custom mountpoints are not supported for ostree types") assert.EqualError(t, err, "Custom mountpoints are not supported for ostree types")