Skip to content

distrodefs/fedora: add supported customizations for net installer #1768

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
achilleas-k merged 1 commit into from
Aug 27, 2025
Merged

distrodefs/fedora: add supported customizations for net installer #1768

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions data/distrodefs/fedora/imagetypes.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2169,3 +2169,5 @@ image_types:
- *aarch64_installer_platform
supported_blueprint_options:
- "distro"
- "customizations.fips"
- "customizations.locale"
2 changes: 1 addition & 1 deletion pkg/distro/distro_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -640,7 +640,7 @@ func TestDistro_ManifestFIPSWarning(t *testing.T) {
switch imgTypeName {
case "workstation-live-installer":
assert.EqualError(t, err, fmt.Sprintf("blueprint validation failed for image type %q: customizations.fips: not supported", imgTypeName))
case "wsl", "iot-bootable-container", "container", "everything-netinst":
case "wsl", "iot-bootable-container", "container":
assert.EqualError(t, err, fmt.Sprintf("blueprint validation failed for image type %q: customizations: not supported", imgTypeName))
default:
assert.Equal(t, slices.Contains(warn, msg), !common.IsBuildHostFIPSEnabled(),
Expand Down
32 changes: 16 additions & 16 deletions pkg/distro/generic/fedora_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -508,13 +508,13 @@ func TestFedoraDistro_ManifestError(t *testing.T) {
switch imgTypeName {
case "iot-commit", "iot-container":
assert.EqualError(t, err, fmt.Sprintf("blueprint validation failed for image type %q: customizations.kernel.append: not supported", imgTypeName))
case "minimal-installer", "iot-installer", "workstation-live-installer":
case "minimal-installer", "iot-installer", "workstation-live-installer", "everything-netinst":
assert.EqualError(t, err, fmt.Sprintf("blueprint validation failed for image type %q: customizations.kernel: not supported", imgTypeName))
case "iot-simplified-installer":
assert.EqualError(t, err, fmt.Sprintf("blueprint validation failed for image type %q: customizations.installation_device: required", imgTypeName))
case "iot-raw-xz", "iot-qcow2":
assert.EqualError(t, err, fmt.Sprintf("%s: ostree commit URL required", imgTypeName))
case "container", "wsl", "iot-bootable-container", "everything-netinst":
case "container", "wsl", "iot-bootable-container":
assert.EqualError(t, err, fmt.Sprintf("blueprint validation failed for image type %q: customizations: not supported", imgTypeName))
default:
assert.NoError(t, err)
Expand Down Expand Up @@ -719,9 +719,9 @@ func TestFedoraDistro_CustomFileSystemManifestError(t *testing.T) {
imgType, _ := arch.GetImageType(imgTypeName)
_, _, err := imgType.Manifest(&bp, distro.ImageOptions{OSTree: maybeMakeOSTreeURL(imgTypeName)}, nil, nil)
switch imgTypeName {
case "minimal-installer", "iot-installer", "workstation-live-installer", "iot-simplified-installer", "iot-commit", "iot-container":
case "minimal-installer", "iot-installer", "workstation-live-installer", "iot-simplified-installer", "iot-commit", "iot-container", "everything-netinst":
assert.EqualError(t, err, fmt.Sprintf("blueprint validation failed for image type %q: customizations.filesystem: not supported", imgTypeName))
case "container", "wsl", "iot-bootable-container", "everything-netinst":
case "container", "wsl", "iot-bootable-container":
assert.EqualError(t, err, fmt.Sprintf("blueprint validation failed for image type %q: customizations: not supported", imgTypeName))
default:
// TODO: this error message is a bit clunky; bring it more in line with the other messages (remove "The following errors ...")
Expand Down Expand Up @@ -750,9 +750,9 @@ func TestFedoraDistro_TestRootMountPoint(t *testing.T) {
imgType, _ := arch.GetImageType(imgTypeName)
_, _, err := imgType.Manifest(&bp, distro.ImageOptions{OSTree: maybeMakeOSTreeURL(imgTypeName)}, nil, nil)
switch imgTypeName {
case "minimal-installer", "workstation-live-installer", "iot-simplified-installer", "iot-installer", "iot-commit", "iot-container":
case "minimal-installer", "workstation-live-installer", "iot-simplified-installer", "iot-installer", "iot-commit", "iot-container", "everything-netinst":
assert.EqualError(t, err, fmt.Sprintf("blueprint validation failed for image type %q: customizations.filesystem: not supported", imgTypeName))
case "wsl", "iot-bootable-container", "container", "everything-netinst":
case "wsl", "iot-bootable-container", "container":
assert.EqualError(t, err, fmt.Sprintf("blueprint validation failed for image type %q: customizations: not supported", imgTypeName))
default:
assert.NoError(t, err)
Expand Down Expand Up @@ -784,9 +784,9 @@ func TestFedoraDistro_CustomFileSystemSubDirectories(t *testing.T) {
imgType, _ := arch.GetImageType(imgTypeName)
_, _, err := imgType.Manifest(&bp, distro.ImageOptions{OSTree: maybeMakeOSTreeURL(imgTypeName)}, nil, nil)
switch imgTypeName {
case "minimal-installer", "workstation-live-installer", "iot-simplified-installer", "iot-installer", "iot-commit", "iot-container":
case "minimal-installer", "workstation-live-installer", "iot-simplified-installer", "iot-installer", "iot-commit", "iot-container", "everything-netinst":
assert.EqualError(t, err, fmt.Sprintf("blueprint validation failed for image type %q: customizations.filesystem: not supported", imgTypeName))
case "wsl", "iot-bootable-container", "container", "everything-netinst":
case "wsl", "iot-bootable-container", "container":
assert.EqualError(t, err, fmt.Sprintf("blueprint validation failed for image type %q: customizations: not supported", imgTypeName))
default:
assert.NoError(t, err)
Expand Down Expand Up @@ -826,9 +826,9 @@ func TestFedoraDistro_MountpointsWithArbitraryDepthAllowed(t *testing.T) {
imgType, _ := arch.GetImageType(imgTypeName)
_, _, err := imgType.Manifest(&bp, distro.ImageOptions{OSTree: maybeMakeOSTreeURL(imgTypeName)}, nil, nil)
switch imgTypeName {
case "minimal-installer", "workstation-live-installer", "iot-simplified-installer", "iot-installer", "iot-commit", "iot-container":
case "minimal-installer", "workstation-live-installer", "iot-simplified-installer", "iot-installer", "iot-commit", "iot-container", "everything-netinst":
assert.EqualError(t, err, fmt.Sprintf("blueprint validation failed for image type %q: customizations.filesystem: not supported", imgTypeName))
case "wsl", "iot-bootable-container", "container", "everything-netinst":
case "wsl", "iot-bootable-container", "container":
assert.EqualError(t, err, fmt.Sprintf("blueprint validation failed for image type %q: customizations: not supported", imgTypeName))
default:
assert.NoError(t, err)
Expand Down Expand Up @@ -864,9 +864,9 @@ func TestFedoraDistro_DirtyMountpointsNotAllowed(t *testing.T) {
imgType, _ := arch.GetImageType(imgTypeName)
_, _, err := imgType.Manifest(&bp, distro.ImageOptions{OSTree: maybeMakeOSTreeURL(imgTypeName)}, nil, nil)
switch imgTypeName {
case "minimal-installer", "workstation-live-installer", "iot-simplified-installer", "iot-installer", "iot-commit", "iot-container":
case "minimal-installer", "workstation-live-installer", "iot-simplified-installer", "iot-installer", "iot-commit", "iot-container", "everything-netinst":
assert.EqualError(t, err, fmt.Sprintf("blueprint validation failed for image type %q: customizations.filesystem: not supported", imgTypeName))
case "wsl", "iot-bootable-container", "container", "everything-netinst":
case "wsl", "iot-bootable-container", "container":
assert.EqualError(t, err, fmt.Sprintf("blueprint validation failed for image type %q: customizations: not supported", imgTypeName))
default:
// TODO: this error message is a bit clunky; bring it more in line with the other messages (remove "The following errors ...")
Expand Down Expand Up @@ -898,9 +898,9 @@ func TestFedoraDistro_CustomUsrPartitionNotLargeEnough(t *testing.T) {
imgType, _ := arch.GetImageType(imgTypeName)
_, _, err := imgType.Manifest(&bp, options, nil, nil)
switch imgTypeName {
case "workstation-live-installer", "iot-container", "iot-commit", "iot-installer", "iot-simplified-installer", "minimal-installer":
case "workstation-live-installer", "iot-container", "iot-commit", "iot-installer", "iot-simplified-installer", "minimal-installer", "everything-netinst":
assert.EqualError(t, err, fmt.Sprintf("blueprint validation failed for image type %q: customizations.filesystem: not supported", imgTypeName))
case "wsl", "iot-bootable-container", "container", "everything-netinst":
case "wsl", "iot-bootable-container", "container":
assert.EqualError(t, err, fmt.Sprintf("blueprint validation failed for image type %q: customizations: not supported", imgTypeName))
default:
assert.NoError(t, err)
Expand Down Expand Up @@ -942,9 +942,9 @@ func TestFedoraDistro_PartitioningConflict(t *testing.T) {
}
_, _, err := imgType.Manifest(&bp, options, nil, nil)
switch imgTypeName {
case "workstation-live-installer", "iot-container", "iot-commit", "iot-installer", "iot-simplified-installer", "minimal-installer":
case "workstation-live-installer", "iot-container", "iot-commit", "iot-installer", "iot-simplified-installer", "minimal-installer", "everything-netinst":
assert.EqualError(t, err, fmt.Sprintf("blueprint validation failed for image type %q: customizations.filesystem: not supported", imgTypeName))
case "wsl", "iot-bootable-container", "container", "everything-netinst":
case "wsl", "iot-bootable-container", "container":
assert.EqualError(t, err, fmt.Sprintf("blueprint validation failed for image type %q: customizations: not supported", imgTypeName))
default:
assert.EqualError(t, err, fmt.Sprintf("blueprint validation failed for image type %q: customizations.disk cannot be used with customizations.filesystem", imgTypeName))
Expand Down
Loading