osbuild: re-arrange manifests; tweak runvm-osbuild

src/cmd-buildextend-metal

@@ -290,9 +290,9 @@ if [ "${OSBUILD_SUPPORTED:-}" != "" ] && [ "${COSA_USE_OSBUILD:-}" != "" ]; then
     # so for those we'll set `snapshot=on` so that each will get their own disk image.
     # This is OK because we don't checkpoint (cache) any of those stages.
     [ "${image_type}" == "qemu" ] && snapshot="off" || snapshot="on"
-    runvm_with_cache_snapshot "$snapshot" -- /usr/lib/coreos-assembler/runvm-osbuild  \
-                --config "${image_for_disk_json}"                                     \
-                --mpp "/usr/lib/coreos-assembler/coreos.osbuild.${basearch}.mpp.yaml" \
+    runvm_with_cache_snapshot "$snapshot" -- /usr/lib/coreos-assembler/runvm-osbuild                    \
+                --config "${image_for_disk_json}"                                                       \
+                --mpp "/usr/lib/coreos-assembler/osbuild-manifests/coreos.osbuild.${basearch}.mpp.yaml" \
                 --filepath "${path}.tmp"
 else
     runvm "${qemu_args[@]}" -- \

src/coreos.osbuild.aarch64.mpp.yaml → src/osbuild-manifests/coreos.osbuild.aarch64.mpp.yaml

@@ -676,3 +676,7 @@ pipelines:
             type: qcow2
             compression: false
             compat: '1.1'
+  - mpp-import-pipelines:
+      path: platform.applehv.ipp.yaml
+  - mpp-import-pipelines:
+      path: platform.hyperv.ipp.yaml

src/coreos.osbuild.x86_64.mpp.yaml → src/osbuild-manifests/coreos.osbuild.x86_64.mpp.yaml

@@ -682,3 +682,7 @@ pipelines:
             type: qcow2
             compression: false
             compat: '1.1'
+  - mpp-import-pipelines:
+      path: platform.applehv.ipp.yaml
+  - mpp-import-pipelines:
+      path: platform.hyperv.ipp.yaml

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

@@ -0,0 +1,56 @@
+# This file isn't yet being used today but holds an OSBuild image
+# definition for the applehv platform.
+version: '2'
+pipelines:
+  - name: raw-applehv-image
+    stages:
+      - type: org.osbuild.copy
+        inputs:
+          tree:
+            type: org.osbuild.tree
+            origin: org.osbuild.pipeline
+            references:
+              - name:raw-image
+        options:
+          paths:
+            - from: input://tree/disk.img
+              to: tree:///disk.img
+      # Increase the size to the cloud image size
+      - type: org.osbuild.truncate
+        options:
+          filename: disk.img
+          size:
+            mpp-format-string: "{cloud_image_size_mb * 1024 * 1024}"
+      - type: org.osbuild.kernel-cmdline.bls-append
+        options:
+          bootpath: mount:///
+          kernel_opts:
+            - ignition.platform.id=applehv
+        devices:
+          boot:
+            type: org.osbuild.loopback
+            options:
+              filename: disk.img
+              start:
+                mpp-format-int: '{image.layout[''boot''].start}'
+              size:
+                mpp-format-int: '{image.layout[''boot''].size}'
+        mounts:
+          - name: boot
+            type: org.osbuild.ext4
+            source: boot
+            target: /
+  - name: applehv
+    stages:
+      - type: org.osbuild.copy
+        inputs:
+          tree:
+            type: org.osbuild.tree
+            origin: org.osbuild.pipeline
+            references:
+              - name:raw-applehv-image
+        options:
+          paths:
+            - from: input://tree/disk.img
+              to:
+                mpp-format-string: 'tree:///{filename}'

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

@@ -0,0 +1,57 @@
+# This file isn't yet being used today but holds an OSBuild image
+# definition for the hyperv platform.
+version: '2'
+pipelines:
+  - name: raw-hyperv-image
+    stages:
+      - type: org.osbuild.copy
+        inputs:
+          tree:
+            type: org.osbuild.tree
+            origin: org.osbuild.pipeline
+            references:
+              - name:raw-image
+        options:
+          paths:
+            - from: input://tree/disk.img
+              to: tree:///disk.img
+      # Increase the size to the cloud image size
+      - type: org.osbuild.truncate
+        options:
+          filename: disk.img
+          size:
+            mpp-format-string: "{cloud_image_size_mb * 1024 * 1024}"
+      - type: org.osbuild.kernel-cmdline.bls-append
+        options:
+          bootpath: mount:///
+          kernel_opts:
+            - ignition.platform.id=hyperv
+        devices:
+          boot:
+            type: org.osbuild.loopback
+            options:
+              filename: disk.img
+              start:
+                mpp-format-int: '{image.layout[''boot''].start}'
+              size:
+                mpp-format-int: '{image.layout[''boot''].size}'
+        mounts:
+          - name: boot
+            type: org.osbuild.ext4
+            source: boot
+            target: /
+  - name: hyperv
+    stages:
+      - type: org.osbuild.qemu
+        inputs:
+          image:
+            type: org.osbuild.files
+            origin: org.osbuild.pipeline
+            references:
+              name:raw-hyperv-image:
+                file: disk.img
+        options:
+          filename:
+            mpp-format-string: '{filename}'
+          format:
+            type: vhdx

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

@@ -0,0 +1,2 @@
+# This file isn't used today but will hold the OSBuild image
+# defintion for the qemu platform in the future.

src/runvm-osbuild

@@ -46,8 +46,8 @@ done
 # Get the base filename of the desired file output path
 filename=$(basename "$filepath")
 
-ostree_repo=$(getconfig "ostree-repo")
-ostree_ref=$(getconfig "ostree-ref")
+ostree_repo=$(getconfig_def "ostree-repo" "")
+ostree_ref=$(getconfig_def "ostree-ref" "")
 osname=$(getconfig "osname")
 platform=$(getconfig "image-type")
 deploy_via_container=$(getconfig_def "deploy-via-container" "")
@@ -63,14 +63,16 @@ if [ -n "${deploy_via_container}" ]; then
 fi
 
 # Since it doesn't exist create loop-control
-mknod /dev/loop-control c 10 237
+[ ! -e /dev/loop-control ] && mknod /dev/loop-control c 10 237
 
 # Put the store and the output dir on the cache. At the end we'll mv
 # out the created artifact from the output dir to the place it's supposed
 # to go.
 outdir=cache/osbuild/out
 storedir=cache/osbuild/store
 
+processed_json=$(mktemp -t osbuild-XXXX.json)
+
 # Run through the preprocessor
 # Note: don't quote the size arguements since they are numbers, not strings
 osbuild-mpp                                             \
@@ -82,8 +84,7 @@ osbuild-mpp                                             \
     -D container_imgref=\""${container_imgref}"\"       \
     -D metal_image_size_mb="${metal_image_size_mb}"     \
     -D cloud_image_size_mb="${cloud_image_size_mb}"     \
-    "${mppyaml}"                                        \
-    /processed.json
+    "${mppyaml}" "${processed_json}"
 
 # Build the image
 osbuild \
@@ -92,9 +93,11 @@ osbuild \
     --cache-max-size 9GiB        \
     --checkpoint tree            \
     --checkpoint raw-image       \
-    --export "$platform" /processed.json
+    --export "$platform" "${processed_json}"
 
 
 # Copy it out to the specified location. Use mv here so we remove it
 # from the cache qcow2 so we don't cache it.
 mv "${outdir}/${platform}/${filename}" "${filepath}"
+
+rm -f "${processed_json}"