ova: set os type and virtual hardware version (HMS-3248)

data/dependencies/deps_test.go

@@ -8,5 +8,5 @@ import (
 )
 
 func TestMinimumOSBuildVersion(t *testing.T) {
-	assert.Equal(t, "183", dependencies.MinimumOSBuildVersion())
+	assert.Equal(t, "185", dependencies.MinimumOSBuildVersion())
 }

data/dependencies/osbuild

@@ -1 +1 @@
-183
+185

data/distrodefs/eln-11/disk.yaml

@@ -651,6 +651,13 @@ image_types:
     platforms:
       - <<: *x86_64_bios_platform
         image_format: "ova"
+    disk_config:
+      ovf_vmware:
+        # Ideally we would use rhel10_64Guest, but this requires vmx-22 (vcenter 9+). And many users
+        # are trying to use vcenter 8 for as long as possible. If this should change at some point
+        # in future, it should become part of the blueprint.
+        os_type: "rhel9_64Guest"
+        virtual_hardware_version: "vmx-21"
     blueprint:
       supported_options: *supported_options_disk
 

data/distrodefs/fedora/imagetypes.yaml

@@ -1538,6 +1538,10 @@ image_types:
     name_aliases: ["ova", "vsphere-ova"]
     filename: "image.ova"
     mime_type: "application/ovf"
+    disk_config:
+      ovf_vmware:
+        os_type: "fedora64Guest"
+        virtual_hardware_version: "vmx-21"
     exports: ["archive"]
     platforms:
       - <<: *x86_64_bios_platform

data/distrodefs/rhel-10/imagetypes.yaml

@@ -1526,6 +1526,13 @@ image_types:
     platforms:
       - <<: *x86_64_bios_platform
         image_format: "ova"
+    disk_config:
+      ovf_vmware:
+        # Ideally we would use rhel10_64Guest, but this requires vmx-22 (vcenter 9+). And many users
+        # are trying to use vcenter 8 for as long as possible. If this should change at some point
+        # in future, it should become part of the blueprint.
+        os_type: "rhel9_64Guest"
+        virtual_hardware_version: "vmx-21"
     blueprint:
       supported_options: *supported_options_disk
 

data/distrodefs/rhel-8/imagetypes.yaml

@@ -2473,6 +2473,10 @@ image_types:
     platforms:
       - <<: *x86_64_bios_platform
         image_format: "ova"
+    disk_config:
+      ovf_vmware:
+        os_type: "rhel8_64Guest"
+        virtual_hardware_version: "vmx-15"
     blueprint:
       supported_options: *supported_options_disk
 

data/distrodefs/rhel-9/imagetypes.yaml

@@ -2068,6 +2068,10 @@ image_types:
     platforms:
       - <<: *x86_64_bios_platform
         image_format: "ova"
+    disk_config:
+      ovf_vmware:
+        os_type: "rhel9_64Guest"
+        virtual_hardware_version: "vmx-18"
     blueprint:
       supported_options: *supported_options_disk
 

pkg/distro/disk_config.go

@@ -14,6 +14,8 @@ type DiskConfig struct {
 
 	// Mostly for RHEL7 compat though might be purposed in the future
 	PartitioningTool *osbuild.PartTool `yaml:"partitioning_tool,omitempty"`
+
+	OVFVMWare *osbuild.OVFVMWareStageOptions `yaml:"ovf_vmware,omitempty"`
 }
 
 // InheritFrom inherits unset values from the provided parent configuration and

pkg/distro/generic/images.go

@@ -666,6 +666,9 @@ func diskCustomizations(t *imageType) (manifest.DiskCustomizations, error) {
 		if diskConfig.PartitioningTool != nil {
 			diskCust.PartitioningTool = *diskConfig.PartitioningTool
 		}
+		if diskConfig.OVFVMWare != nil {
+			diskCust.OVFVMWare = *diskConfig.OVFVMWare
+		}
 	}
 
 	return diskCust, nil

pkg/image/disk.go

@@ -99,6 +99,8 @@ func (img *DiskImage) InstantiateManifest(m *manifest.Manifest,
 	case platform.FORMAT_OVA:
 		vmdkPipeline := manifest.NewVMDK(buildPipeline, rawImagePipeline)
 		ovfPipeline := manifest.NewOVF(buildPipeline, vmdkPipeline)
+		ovfPipeline.VMWareOSType = img.DiskCustomizations.OVFVMWare.OSType
+		ovfPipeline.VMWareVirtualHardwareVersion = img.DiskCustomizations.OVFVMWare.VirtualHardwareVersion
 		tarPipeline := manifest.NewTar(buildPipeline, ovfPipeline, "archive")
 		tarPipeline.Format = osbuild.TarArchiveFormatUstar
 		tarPipeline.SetFilename(img.filename)

pkg/manifest/disk.go

@@ -11,6 +11,8 @@ type DiskCustomizations struct {
 
 	// Which partitioning tooling is used to create the disk image(s)
 	PartitioningTool osbuild.PartTool
+
+	OVFVMWare osbuild.OVFVMWareStageOptions
 }
 
 func NewDiskCustomizations() DiskCustomizations {

pkg/manifest/ovf.go

@@ -11,6 +11,9 @@ type OVF struct {
 	Base
 
 	imgPipeline *VMDK
+
+	VMWareOSType                 string
+	VMWareVirtualHardwareVersion string
 }
 
 // NewOVF creates a new OVF pipeline. imgPipeline is the pipeline producing the vmdk image.
@@ -47,9 +50,16 @@ func (p *OVF) serialize() (osbuild.Pipeline, error) {
 		osbuild.NewPipelineTreeInputs(inputName, p.imgPipeline.Name()),
 	))
 
-	pipeline.AddStage(osbuild.NewOVFStage(&osbuild.OVFStageOptions{
+	options := &osbuild.OVFStageOptions{
 		Vmdk: p.imgPipeline.Filename(),
-	}))
+	}
+	if p.VMWareOSType != "" || p.VMWareVirtualHardwareVersion != "" {
+		options.VMWare = &osbuild.OVFVMWareStageOptions{
+			OSType:                 p.VMWareOSType,
+			VirtualHardwareVersion: p.VMWareVirtualHardwareVersion,
+		}
+	}
+	pipeline.AddStage(osbuild.NewOVFStage(options))
 
 	return pipeline, nil
 }

pkg/osbuild/ovf_stage.go

@@ -6,6 +6,7 @@ import (
 )
 
 const vmdkRegex = "^[a-zA-Z0-9+_.-]*$"
+const vhwvRegex = "^vmx-[0-9]+$"
 
 type OVFStageOptions struct {
 	Vmdk       string                     `json:"vmdk"`
@@ -14,7 +15,8 @@ type OVFStageOptions struct {
 }
 
 type OVFVMWareStageOptions struct {
-	OSType string `json:"os_type,omitempty"`
+	OSType                 string `json:"os_type,omitempty" yaml:"os_type,omitempty"`
+	VirtualHardwareVersion string `json:"virtual_hardware_version,omitempty" yaml:"virtual_hardware_version,omitempty"`
 }
 
 type OVFVirtualBoxStageOptions struct {
@@ -33,6 +35,13 @@ func (o OVFStageOptions) validate() error {
 		return fmt.Errorf("'vmdk' name %q doesn't conform to schema (%s)", o.Vmdk, exp.String())
 	}
 
+	if o.VMWare != nil && o.VMWare.VirtualHardwareVersion != "" {
+		exp = regexp.MustCompile(vhwvRegex)
+		if !exp.MatchString(o.VMWare.VirtualHardwareVersion) {
+			return fmt.Errorf("'vmdk' name %q doesn't conform to schema (%s)", o.Vmdk, exp.String())
+		}
+	}
+
 	return nil
 }