Skip to content

Commit

Permalink
osbuild: output applehv and hyperv in uncompressed formats
Browse files Browse the repository at this point in the history
They will now be compressed in the `cosa compress` CoreOS pipeline
stage.
  • Loading branch information
dustymabe authored and jlebon committed Dec 4, 2024
1 parent 53296e2 commit a13cf77
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 27 deletions.
6 changes: 3 additions & 3 deletions src/cmd-osbuild
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ dn=$(dirname "$0")
# A list of supported platforms and the filename suffix of the main
# artifact that platform produces.
declare -A SUPPORTED_PLATFORMS=(
['applehv']='raw.gz'
['applehv']='raw'
['gcp']='tar.gz'
['hyperv']='vhdx.zip'
['hyperv']='vhdx'
['metal4k']='raw'
['metal']='raw'
['qemu']='qcow2'
Expand Down Expand Up @@ -384,7 +384,7 @@ main() {

# Perform postprocessing
case "$platform" in
applehv|gcp|hyperv)
gcp)
# Update the meta.json and builddir with the generated artifact.
# Skip Compression on these platforms as they are already compressed.
postprocess_artifact "${platform}" "${imgpath}" "${imgname}" 'True'
Expand Down
16 changes: 8 additions & 8 deletions src/osbuild-manifests/platform.applehv.ipp.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -55,15 +55,15 @@ pipelines:
build:
mpp-format-string: '{buildroot}'
stages:
- type: org.osbuild.gzip
- type: org.osbuild.copy
inputs:
file:
type: org.osbuild.files
tree:
type: org.osbuild.tree
origin: org.osbuild.pipeline
references:
name:raw-applehv-image:
file: disk.img
- name:raw-applehv-image
options:
level: 9
filename:
mpp-format-string: '{artifact_name_prefix}-applehv.{arch}.raw.gz'
paths:
- from: input://tree/disk.img
to:
mpp-format-string: 'tree:///{artifact_name_prefix}-applehv.{arch}.raw'
17 changes: 1 addition & 16 deletions src/osbuild-manifests/platform.hyperv.ipp.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ pipelines:
partition:
mpp-format-int: '{image.layout[''boot''].partnum}'
target: /boot
- name: raw-hyperv-image-vhdx
- name: hyperv
build:
mpp-format-string: '{host_as_buildroot}'
stages:
Expand All @@ -68,18 +68,3 @@ pipelines:
mpp-format-string: '{artifact_name_prefix}-hyperv.{arch}.vhdx'
format:
type: vhdx
- name: hyperv
build:
mpp-format-string: '{host_as_buildroot}'
stages:
- type: org.osbuild.zip
inputs:
tree:
type: org.osbuild.tree
origin: org.osbuild.pipeline
references:
- name:raw-hyperv-image-vhdx
options:
level: 9
filename:
mpp-format-string: '{artifact_name_prefix}-hyperv.{arch}.vhdx.zip'

0 comments on commit a13cf77

Please sign in to comment.