bootc_disk: Add support for vmdk, ova

[cgwalters]

BIB PR using this: osbuild/bootc-image-builder#251

---

We want to support generating VMDK for bootc containers too.

[cgwalters]

So...I tried this out along with this patch for bib

From 2dd6c0ea3146191b16f6452f5cc3c3d6b191bc44 Mon Sep 17 00:00:00 2001
From: Colin Walters <[email protected]>
Date: Wed, 6 Mar 2024 18:04:21 -0500
Subject: [PATCH] wip

---
 bib/cmd/bootc-image-builder/image.go | 8 +++++++-
 bib/cmd/bootc-image-builder/main.go  | 6 +++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/bib/cmd/bootc-image-builder/image.go b/bib/cmd/bootc-image-builder/image.go
index d80c38a..4f8d89f 100644
--- a/bib/cmd/bootc-image-builder/image.go
+++ b/bib/cmd/bootc-image-builder/image.go
@@ -48,7 +48,7 @@ func Manifest(c *ManifestConfig) (*manifest.Manifest, error) {
 	rng := createRand()
 
 	switch c.ImgType {
-	case "ami", "qcow2", "raw":
+	case "ami", "qcow2", "raw", "vmdk", "ova":
 		return manifestForDiskImage(c, rng)
 	case "anaconda-iso", "iso":
 		return manifestForISO(c, rng)
@@ -95,6 +95,12 @@ func manifestForDiskImage(c *ManifestConfig, rng *rand.Rand) (*manifest.Manifest
 	case "ami", "raw":
 		imageFormat = platform.FORMAT_RAW
 		filename = "disk.raw"
+	case "vmdk":
+		imageFormat = platform.FORMAT_VMDK
+		filename = "disk.vmdk"
+	case "ova":
+		imageFormat = platform.FORMAT_OVA
+		filename = "disk.ova"
 	}
 
 	switch c.Architecture {
diff --git a/bib/cmd/bootc-image-builder/main.go b/bib/cmd/bootc-image-builder/main.go
index 9423e48..fd03ce4 100644
--- a/bib/cmd/bootc-image-builder/main.go
+++ b/bib/cmd/bootc-image-builder/main.go
@@ -282,10 +282,14 @@ func cmdBuild(cmd *cobra.Command, args []string) error {
 		exports = []string{"qcow2"}
 	case "ami", "raw":
 		exports = []string{"image"}
+	case "vmdk":
+		exports = []string{"vmdk"}
+	case "ova":
+		exports = []string{"ovf"}
 	case "anaconda-iso", "iso":
 		exports = []string{"bootiso"}
 	default:
-		return fmt.Errorf("valid types are 'qcow2', 'ami', 'raw', 'anaconda-iso', not: '%s'", imgType)
+		return fmt.Errorf("valid types are 'qcow2', 'ami', 'raw', 'vmdk', 'anaconda-iso', not: '%s'", imgType)
 	}
 
 	manifestPath := filepath.Join(outputDir, manifest_fname)
-- 
2.43.0

And with that, I get this:

FileNotFoundError: [Errno 2] No such file or directory: 'qemu-img'

And yes, now I realize this is harder than I thought, because we need to either:

• Add that into our base images and assume its presence (eww)
• Add that into bib (edit: it's already there! thankfully), and rework the build pipeline to use the container as buildroot (I have no idea about doing this)

[cgwalters]

OK, if the remaining work is bib side and you think this is right - then lifting draft here.

[achilleas-k]

• Add that into bib (edit: it's already there! thankfully), and rework the build pipeline to use the container as buildroot (I have no idea about doing this)

See my in-line comment https://github.com/osbuild/images/pull/504/files#r1516881294

[achilleas-k]

Make pipelines run outside the build root.

[achilleas-k]

OK, if the remaining work is bib side and you think this is right - then lifting draft here.

Sorry for the confusion. I looked at the code before noticing the comment and it looked good but then realised the issue with the build root :)

[cgwalters]

OK yep updated, this generates an image! No idea if it works in vsphere yet, will ping about that.

[mvo5]

Thank you! Let's land it as is and we (images team) will look into the suggested refactor (which makes a ton of sense) in a followup

This is addressed now, the pipeline runs now from the bib context.