Skip to content

Commit a13cf77

Browse files
dustymabejlebon
authored andcommitted
osbuild: output applehv and hyperv in uncompressed formats
They will now be compressed in the `cosa compress` CoreOS pipeline stage.
1 parent 53296e2 commit a13cf77

File tree

3 files changed

+12
-27
lines changed

3 files changed

+12
-27
lines changed

src/cmd-osbuild

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ dn=$(dirname "$0")
88
# A list of supported platforms and the filename suffix of the main
99
# artifact that platform produces.
1010
declare -A SUPPORTED_PLATFORMS=(
11-
['applehv']='raw.gz'
11+
['applehv']='raw'
1212
['gcp']='tar.gz'
13-
['hyperv']='vhdx.zip'
13+
['hyperv']='vhdx'
1414
['metal4k']='raw'
1515
['metal']='raw'
1616
['qemu']='qcow2'
@@ -384,7 +384,7 @@ main() {
384384

385385
# Perform postprocessing
386386
case "$platform" in
387-
applehv|gcp|hyperv)
387+
gcp)
388388
# Update the meta.json and builddir with the generated artifact.
389389
# Skip Compression on these platforms as they are already compressed.
390390
postprocess_artifact "${platform}" "${imgpath}" "${imgname}" 'True'

src/osbuild-manifests/platform.applehv.ipp.yaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -55,15 +55,15 @@ pipelines:
5555
build:
5656
mpp-format-string: '{buildroot}'
5757
stages:
58-
- type: org.osbuild.gzip
58+
- type: org.osbuild.copy
5959
inputs:
60-
file:
61-
type: org.osbuild.files
60+
tree:
61+
type: org.osbuild.tree
6262
origin: org.osbuild.pipeline
6363
references:
64-
name:raw-applehv-image:
65-
file: disk.img
64+
- name:raw-applehv-image
6665
options:
67-
level: 9
68-
filename:
69-
mpp-format-string: '{artifact_name_prefix}-applehv.{arch}.raw.gz'
66+
paths:
67+
- from: input://tree/disk.img
68+
to:
69+
mpp-format-string: 'tree:///{artifact_name_prefix}-applehv.{arch}.raw'

src/osbuild-manifests/platform.hyperv.ipp.yaml

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ pipelines:
5151
partition:
5252
mpp-format-int: '{image.layout[''boot''].partnum}'
5353
target: /boot
54-
- name: raw-hyperv-image-vhdx
54+
- name: hyperv
5555
build:
5656
mpp-format-string: '{host_as_buildroot}'
5757
stages:
@@ -68,18 +68,3 @@ pipelines:
6868
mpp-format-string: '{artifact_name_prefix}-hyperv.{arch}.vhdx'
6969
format:
7070
type: vhdx
71-
- name: hyperv
72-
build:
73-
mpp-format-string: '{host_as_buildroot}'
74-
stages:
75-
- type: org.osbuild.zip
76-
inputs:
77-
tree:
78-
type: org.osbuild.tree
79-
origin: org.osbuild.pipeline
80-
references:
81-
- name:raw-hyperv-image-vhdx
82-
options:
83-
level: 9
84-
filename:
85-
mpp-format-string: '{artifact_name_prefix}-hyperv.{arch}.vhdx.zip'

0 commit comments

Comments
 (0)