particle-os/debian-forge
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Stages: support vmdk subformat in the qemu stage

Browse source 
Support specifying the subformat for the `vmdk` image type in the
`org.osbuild.qemu` stage.
This commit is contained in:
Tomas Hozza 2022-04-04 17:24:40 +02:00 • committed by Tomáš Hozza
parent b4593f0f2b
commit bbe6127ddb
4 changed files with 77 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

15
stages/org.osbuild.qemu
View file

@ -61,6 +61,11 @@ SCHEMA_2 = r"""
"description": "The type of the format, here 'vmdk'",
"type": "string",
"enum": ["vmdk"]
},
"subformat": {
"description": "VMDK flat extent format",
"type": "string",
"enum": ["monolithicSparse", "monolithicFlat", "twoGbMaxExtentSparse", "twoGbMaxExtentFlat", "streamOptimized"]
}
}
},
@ -133,6 +138,14 @@ def qcow2_arguments(options):
return argv
def vmdk_arguments(options):
argv = ["-c"]
subformat = options.get("subformat")
if subformat:
argv += ["-o", f"subformat={subformat}"]
return argv
def parse_input(inputs):
image = inputs["image"]
files = image["data"]["files"]
@ -153,7 +166,7 @@ def main(inputs, output, options):
formats = {
"qcow2": qcow2_arguments,
"vdi": [],
"vmdk": ["-c"],
"vmdk": vmdk_arguments,
"vpc": ["-o", "subformat=fixed,force_size"],
"vhdx": []
}

9
test/data/stages/qemu/checks.json
View file

@ -17,6 +17,15 @@
"image.vmdk": {
"format": "vmdk"
},
"image-stream.vmdk": {
"format": "vmdk",
"format-specific": {
"type": "vmdk",
"data": {
"create-type": "streamOptimized"
}
}
},
"image.vpc": {
"format": "raw"
},

27
test/data/stages/qemu/qemu.json
View file

@ -468,6 +468,33 @@
}
]
},
{
"name": "image-stream.vmdk",
"build": "name:build",
"stages": [
{
"type": "org.osbuild.qemu",
"inputs": {
"image": {
"type": "org.osbuild.files",
"origin": "org.osbuild.pipeline",
"references": {
"name:image": {
"file": "image.raw"
}
}
}
},
"options": {
"filename": "image-stream.vmdk",
"format": {
"type": "vmdk",
"subformat": "streamOptimized"
}
}
}
]
},
{
"name": "image.vpc",
"build": "name:build",

27
test/data/stages/qemu/qemu.mpp.json
View file

@ -126,6 +126,33 @@
}
]
},
{
"name": "image-stream.vmdk",
"build": "name:build",
"stages": [
{
"type": "org.osbuild.qemu",
"inputs": {
"image": {
"type": "org.osbuild.files",
"origin": "org.osbuild.pipeline",
"references": {
"name:image": {
"file": "image.raw"
}
}
}
},
"options": {
"filename": "image-stream.vmdk",
"format": {
"type": "vmdk",
"subformat": "streamOptimized"
}
}
}
]
},
{
"name": "image.vpc",
"build": "name:build",