osbuild: output applehv and hyperv in uncompressed formats

They will now be compressed in the `cosa compress` CoreOS pipeline stage.
coreos · Dec 3, 2024 · 158d8d7 · 158d8d7
1 parent 7633fb7
commit 158d8d7
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 27 deletions.
diff --git a/src/cmd-osbuild b/src/cmd-osbuild
@@ -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'
@@ -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'

diff --git a/src/osbuild-manifests/platform.applehv.ipp.yaml b/src/osbuild-manifests/platform.applehv.ipp.yaml
@@ -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'
diff --git a/src/osbuild-manifests/platform.hyperv.ipp.yaml b/src/osbuild-manifests/platform.hyperv.ipp.yaml
@@ -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:
@@ -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'