fedora: image type names follow variants

Fedora consists of many variants. Historically we haven't really based
our own definitions on anything. Let's introduce variant name prefixes
to all Fedora image types to indicate what variant they are based on.

The next commit will then make these variants similar to (or equal to)
the Fedora variants as they are supposed to be.

We keep the old image type names around as aliases since changing them
is a breaking change. We should however consider deprecating them and
emitting a warning for some time.

Signed-off-by: Simon de Vlieger <supakeen@redhat.com>

Author: supakeen

pkg/distro/defs/fedora/distro.yaml

@@ -272,26 +272,27 @@ image_config:
     timezone: "UTC"
 
 image_types:
-  qcow2: &qcow2
+  server_qcow2: &server_qcow2
     partition_table:
       <<: *default_partition_tables
     package_sets:
-      - *cloud_base_pkgset
-      - include:
-          - "qemu-guest-agent"
-  ami: *qcow2
-  oci: *qcow2
-  openstack: *qcow2
+     - *cloud_base_pkgset
+     - include:
+         - "qemu-guest-agent"
+
+  server_ami: *server_qcow2
+  server_oci: *server_qcow2
+  server_openstack: *server_qcow2
 
-  vhd:
+  server_vhd:
     partition_table:
       <<: *default_partition_tables
     package_sets:
       - *cloud_base_pkgset
       - include:
           - "WALinuxAgent"
 
-  vmdk: &vmdk
+  server_vmdk: &server_vmdk
     partition_table:
       <<: *default_partition_tables
     package_sets:
@@ -313,7 +314,7 @@ image_types:
           - "grubby-deprecated"
           - "extlinux-bootloader"
 
-  ova: *vmdk
+  server_ova: *server_vmdk
 
   # NOTE: keep in sync with official fedora-iot definitions:
   # https://pagure.io/fedora-iot/ostree/blob/main/f/fedora-iot-base.yaml
@@ -437,7 +438,7 @@ image_types:
 
   iot_container: *iot_commit
 
-  iot_raw_image:
+  iot_raw_xz:
     partition_table:
       <<: *iot_base_partition_tables
     partition_table_override:
@@ -447,7 +448,7 @@ image_types:
             - partition_index: 2
               fstab_options: "defaults,ro"
 
-  iot_qcow2_image:
+  iot_qcow2:
     partition_table:
       <<: *iot_base_partition_tables
 
@@ -722,7 +723,7 @@ image_types:
       - include:
           - "fedora-release-iot"
 
-  live_installer:
+  workstation_live_installer:
     package_sets:
       - include:
           - "@workstation-product-environment"
@@ -754,7 +755,7 @@ image_types:
               include:
                 - "anaconda-webui"
 
-  image_installer: *anaconda
+  minimal_installer: *anaconda
 
   container: &container
     package_sets:
@@ -803,7 +804,7 @@ image_types:
           - "whois-nls"
           - "xkeyboard-config"
 
-  wsl:
+  server_wsl:
     package_sets:
       - include:
           - "bash"
@@ -878,6 +879,7 @@ image_types:
               exclude:
                 - "firewalld"
   minimal_raw_zst: *minimal_raw
+  minimal_raw_xz: *minimal_raw
 
   iot_simplified_installer:
     partition_table:

pkg/distro/distro_test.go

@@ -543,12 +543,12 @@ func TestDistro_ManifestFIPSWarning(t *testing.T) {
 		"edge-simplified-installer",
 		"edge-qcow2-image",
 		"iot-installer",
-		"iot-raw-image",
+		"iot-raw-xz",
 		"iot-simplified-installer",
-		"iot-qcow2-image",
+		"iot-qcow2",
 	}
 	noCustomizableImages := []string{
-		"live-installer",
+		"workstation-live-installer",
 		"azure-eap7-rhui",
 	}
 

pkg/distro/distro_test_common/distro_test_common.go

@@ -22,7 +22,7 @@ func isOSTree(imgType distro.ImageType) bool {
 }
 
 func isUbi(imgType distro.ImageType) bool {
-	return imgType.Name() == "wsl"
+	return imgType.Name() == "wsl" || imgType.Name() == "server-wsl"
 }
 
 var knownKernels = []string{"kernel", "kernel-debug", "kernel-rt"}
@@ -84,8 +84,8 @@ func TestDistro_KernelOption(t *testing.T, d distro.Distro) {
 		"edge-simplified-installer": true,
 		"edge-vsphere":              true,
 		"iot-installer":             true,
-		"iot-qcow2-image":           true,
-		"iot-raw-image":             true,
+		"iot-qcow2":                 true,
+		"iot-raw-xz":                true,
 		"iot-simplified-installer":  true,
 
 		// the tar image type is a minimal image type which is not expected to
@@ -98,8 +98,9 @@ func TestDistro_KernelOption(t *testing.T, d distro.Distro) {
 		// image installer on Fedora doesn't support kernel customizations
 		// on RHEL we support kernel name
 		// TODO: Remove when we unify the allowed options
-		"image-installer": true,
-		"live-installer":  true,
+		"image-installer":            true,
+		"minimal-installer":          true,
+		"workstation-live-installer": true,
 	}
 
 	{ // empty blueprint: all image types should just have the default kernel
@@ -184,8 +185,6 @@ func TestDistro_OSTreeOptions(t *testing.T, d distro.Distro) {
 		"edge-simplified-installer": true,
 		"iot-ami":                   true,
 		"iot-installer":             true,
-		"iot-qcow2-image":           true,
-		"iot-raw-image":             true,
 		"iot-simplified-installer":  true,
 	}
 

pkg/distro/fedora/distro.go

@@ -70,14 +70,14 @@ func ostreeDeploymentKernelOptions() []string {
 // Image Definitions
 func mkImageInstallerImgType(d distribution) imageType {
 	return imageType{
-		name:        "image-installer",
-		nameAliases: []string{"fedora-image-installer"},
+		name:        "minimal-installer",
+		nameAliases: []string{"image-installer", "fedora-image-installer"},
 		filename:    "installer.iso",
 		mimeType:    "application/x-iso9660-image",
 		packageSets: map[string]packageSetFunc{
 			osPkgsKey: func(t *imageType) (rpmmd.PackageSet, error) {
 				// use the minimal raw image type for the OS package set
-				return defs.PackageSet(t, "minimal-raw", VersionReplacements())
+				return defs.PackageSet(t, "minimal-raw-xz", VersionReplacements())
 			},
 			installerPkgsKey: packageSetLoader,
 		},
@@ -99,8 +99,8 @@ func mkImageInstallerImgType(d distribution) imageType {
 
 func mkLiveInstallerImgType(d distribution) imageType {
 	return imageType{
-		name:        "live-installer",
-		nameAliases: []string{},
+		name:        "workstation-live-installer",
+		nameAliases: []string{"live-installer"},
 		filename:    "live-installer.iso",
 		mimeType:    "application/x-iso9660-image",
 		packageSets: map[string]packageSetFunc{
@@ -249,8 +249,8 @@ func mkIotSimplifiedInstallerImgType(d distribution) imageType {
 
 func mkIotRawImgType(d distribution) imageType {
 	return imageType{
-		name:        "iot-raw-image",
-		nameAliases: []string{"fedora-iot-raw-image"},
+		name:        "iot-raw-xz",
+		nameAliases: []string{"iot-raw-image", "fedora-iot-raw-image"},
 		filename:    "image.raw.xz",
 		compression: "xz",
 		mimeType:    "application/xz",
@@ -282,7 +282,8 @@ func mkIotRawImgType(d distribution) imageType {
 
 func mkIotQcow2ImgType(d distribution) imageType {
 	return imageType{
-		name:        "iot-qcow2-image",
+		name:        "iot-qcow2",
+		nameAliases: []string{"iot-qcow2-image"}, // kept for backwards compatibility
 		filename:    "image.qcow2",
 		mimeType:    "application/x-qemu-disk",
 		packageSets: map[string]packageSetFunc{},
@@ -309,7 +310,8 @@ func mkIotQcow2ImgType(d distribution) imageType {
 
 func mkQcow2ImgType(d distribution) imageType {
 	return imageType{
-		name:        "qcow2",
+		name:        "server-qcow2",
+		nameAliases: []string{"qcow2"}, // kept for backwards compatibility
 		filename:    "disk.qcow2",
 		mimeType:    "application/x-qemu-disk",
 		environment: &environment.KVM{},
@@ -344,9 +346,10 @@ var (
 
 func mkVmdkImgType(d distribution) imageType {
 	return imageType{
-		name:     "vmdk",
-		filename: "disk.vmdk",
-		mimeType: "application/x-vmdk",
+		name:        "server-vmdk",
+		nameAliases: []string{"vmdk"}, // kept for backwards compatibility
+		filename:    "disk.vmdk",
+		mimeType:    "application/x-vmdk",
 		packageSets: map[string]packageSetFunc{
 			osPkgsKey: packageSetLoader,
 		},
@@ -364,9 +367,10 @@ func mkVmdkImgType(d distribution) imageType {
 
 func mkOvaImgType(d distribution) imageType {
 	return imageType{
-		name:     "ova",
-		filename: "image.ova",
-		mimeType: "application/ovf",
+		name:        "server-ova",
+		nameAliases: []string{"ova"}, // kept for backwards compatibility
+		filename:    "image.ova",
+		mimeType:    "application/ovf",
 		packageSets: map[string]packageSetFunc{
 			osPkgsKey: packageSetLoader,
 		},
@@ -407,9 +411,10 @@ func mkContainerImgType(d distribution) imageType {
 
 func mkWslImgType(d distribution) imageType {
 	return imageType{
-		name:     "wsl",
-		filename: "wsl.tar",
-		mimeType: "application/x-tar",
+		name:        "server-wsl",
+		nameAliases: []string{"wsl"}, // kept for backwards compatibility
+		filename:    "wsl.tar",
+		mimeType:    "application/x-tar",
 		packageSets: map[string]packageSetFunc{
 			osPkgsKey: packageSetLoader,
 		},
@@ -447,7 +452,8 @@ func mkWslImgType(d distribution) imageType {
 
 func mkMinimalRawImgType(d distribution) imageType {
 	it := imageType{
-		name:        "minimal-raw",
+		name:        "minimal-raw-xz",
+		nameAliases: []string{"minimal-raw"}, // kept for backwards compatibility
 		filename:    "disk.raw.xz",
 		compression: "xz",
 		mimeType:    "application/xz",
@@ -691,21 +697,25 @@ func newDistro(version int) distro.Distro {
 	qcow2ImgType := mkQcow2ImgType(rd)
 
 	ociImgType := qcow2ImgType
-	ociImgType.name = "oci"
+	ociImgType.name = "server-oci"
+	ociImgType.nameAliases = []string{"oci"} // kept for backwards compatibility
 
 	amiImgType := qcow2ImgType
-	amiImgType.name = "ami"
+	amiImgType.name = "server-ami"
+	amiImgType.nameAliases = []string{"ami"} // kept for backwards compatibility
 	amiImgType.filename = "image.raw"
 	amiImgType.mimeType = "application/octet-stream"
 	amiImgType.payloadPipelines = []string{"os", "image"}
 	amiImgType.exports = []string{"image"}
 	amiImgType.environment = &environment.EC2{}
 
 	openstackImgType := qcow2ImgType
-	openstackImgType.name = "openstack"
+	openstackImgType.name = "server-openstack"
+	openstackImgType.nameAliases = []string{"openstack"} // kept for backwards compatibility
 
 	vhdImgType := qcow2ImgType
-	vhdImgType.name = "vhd"
+	vhdImgType.name = "server-vhd"
+	vhdImgType.nameAliases = []string{"vhd"} // kept for backwards compatibility
 	vhdImgType.filename = "disk.vhd"
 	vhdImgType.mimeType = "application/x-vhd"
 	vhdImgType.payloadPipelines = []string{"os", "image", "vpc"}
@@ -725,6 +735,7 @@ func newDistro(version int) distro.Distro {
 
 	minimalrawZstdImgType := mkMinimalRawImgType(rd)
 	minimalrawZstdImgType.name = "minimal-raw-zst"
+	minimalrawZstdImgType.nameAliases = []string{}
 	minimalrawZstdImgType.filename = "disk.raw.zst"
 	minimalrawZstdImgType.mimeType = "application/zstd"
 	minimalrawZstdImgType.compression = "zstd"