bib: add a new gce image type

This commit adds a new image type `gce` that contains a tar
file with the raw image inside. This can then be imported
into GCE.

README.md

@@ -159,6 +159,7 @@ The following image types are currently available via the `--type` argument:
 | `anaconda-iso`        | An unattended Anaconda installer that installs to the first disk found.               |
 | `raw`                 | Unformatted [raw disk](https://en.wikipedia.org/wiki/Rawdisk).                        |
 | `vhd`                 | [vhd](https://en.wikipedia.org/wiki/VHD_(file_format)) usable in Virtual PC, among others |
+| `gce`             | GCE input (unformatted raw disk inside a tar.gz file) |
 
 ## 💾 Target architecture
 

bib/cmd/bootc-image-builder/build_type.go

@@ -19,6 +19,7 @@ var supportedImageTypes = map[string]BuildType{
 	"raw":          BuildTypeDisk,
 	"vmdk":         BuildTypeDisk,
 	"vhd":          BuildTypeDisk,
+	"gce":          BuildTypeDisk,
 	"anaconda-iso": BuildTypeISO,
 	"iso":          BuildTypeISO,
 }

bib/cmd/bootc-image-builder/main.go

@@ -440,6 +440,8 @@ func cmdBuild(cmd *cobra.Command, args []string) error {
 		case "vhd":
 			// should we make "vhd" just an alias for "vpc" everywhere?
 			exports = append(exports, "vpc")
+		case "gce":
+			exports = append(exports, "gce")
 		case "anaconda-iso", "iso":
 			exports = append(exports, "bootiso")
 		default:

test/test_build.py

@@ -135,6 +135,7 @@ def build_images(shared_tmpdir, build_container, request, force_aws_upload):
         "raw": pathlib.Path(output_path) / "image/disk.raw",
         "vmdk": pathlib.Path(output_path) / "vmdk/disk.vmdk",
         "vhd": pathlib.Path(output_path) / "vpc/disk.vhd",
+        "gce": pathlib.Path(output_path) / "gce/image.tgz",
         "anaconda-iso": pathlib.Path(output_path) / "bootiso/install.iso",
     }
     assert len(artifact) == len(set(tc.image for tc in gen_testcases("all"))), \
@@ -454,7 +455,7 @@ def test_iso_installs(image_type):
 @pytest.mark.parametrize("images", gen_testcases("multidisk"), indirect=["images"])
 def test_multi_build_request(images):
     artifacts = set()
-    expected = {"disk.qcow2", "disk.raw", "disk.vhd", "disk.vmdk"}
+    expected = {"disk.qcow2", "disk.raw", "disk.vhd", "disk.vmdk", "image.tgz"}
     for result in images:
         filename = os.path.basename(result.img_path)
         assert result.img_path.exists()

test/testcases.py

@@ -4,7 +4,7 @@
 import platform
 
 # disk image types can be build from a single manifest
-DISK_IMAGE_TYPES = ["qcow2", "raw", "vmdk", "vhd"]
+DISK_IMAGE_TYPES = ["qcow2", "raw", "vmdk", "vhd", "gce"]
 
 # supported images that can be booted in a cloud
 CLOUD_BOOT_IMAGE_TYPES = ["ami"]