osbuild: create artifact files with final filenames

Turns out we can stencil in the name of the artifacts we want
to create and just have OSBuild go ahead and write files to the
right name.

Also dropped an extra copy that's not really necessary.

Author: dustymabe

src/cmd-osbuild

@@ -183,6 +183,7 @@ generate_runvm_osbuild_config() {
 
     # Generate the JSON describing the disk we want to build
     yaml2json /dev/stdin "${runvm_osbuild_config_json}" <<EOF
+artifact-name-prefix: "${name}-${build}"
 container-imgref: "${container_imgref}"
 deploy-via-container: "${deploy_via_container}"
 osname: "${name}"
@@ -351,14 +352,11 @@ main() {
                 --platforms "$(IFS=,; echo "${platforms[*]}")"
 
     for platform in "${platforms[@]}"; do
-        suffix="${SUPPORTED_PLATFORMS[$platform]}"
-
         # Set the filename of the artifact and the local image path
-        # where the file will reside temporarily and move it there
-        # from the OSBuild out directory.
+        # where from the OSBuild out directory where it resides.
+        suffix="${SUPPORTED_PLATFORMS[$platform]}"
         imgname=${name}-${build}-${platform}.${basearch}.${suffix}
-        imgpath=${PWD}/${imgname}
-        mv "${outdir}/${platform}/${platform}" "${imgpath}"
+        imgpath="${outdir}/${platform}/${imgname}"
 
         # Perform postprocessing
         case "$platform" in

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

@@ -1,5 +1,6 @@
 version: '2'
 mpp-vars:
+  artifact_name_prefix: $artifact_name_prefix
   ostree_repo: $ostree_repo
   ostree_ref: $ostree_ref
   ociarchive: $ociarchive

src/osbuild-manifests/coreos.osbuild.ppc64le.mpp.yaml

@@ -1,5 +1,6 @@
 version: '2'
 mpp-vars:
+  artifact_name_prefix: $artifact_name_prefix
   ostree_repo: $ostree_repo
   ostree_ref: $ostree_ref
   ociarchive: $ociarchive

src/osbuild-manifests/coreos.osbuild.s390x.mpp.yaml

@@ -1,5 +1,6 @@
 version: '2'
 mpp-vars:
+  artifact_name_prefix: $artifact_name_prefix
   ostree_repo: $ostree_repo
   ostree_ref: $ostree_ref
   ociarchive: $ociarchive

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

@@ -1,5 +1,6 @@
 version: '2'
 mpp-vars:
+  artifact_name_prefix: $artifact_name_prefix
   ostree_repo: $ostree_repo
   ostree_ref: $ostree_ref
   ociarchive: $ociarchive

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

@@ -65,4 +65,5 @@ pipelines:
         options:
           paths:
             - from: input://tree/disk.img
-              to: tree:///applehv
+              to:
+                mpp-format-string: 'tree:///{artifact_name_prefix}-applehv.{arch}.raw'

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

@@ -62,7 +62,7 @@ pipelines:
           tree:
             type: org.osbuild.tree
             origin: org.osbuild.pipeline
-            references:                 
+            references:
               - name:raw-gcp-image
         options:
           filename: disk.tar
@@ -85,4 +85,5 @@ pipelines:
               name:raw-gcp-image-tar:
                 file: disk.tar
         options:
-          filename: gcp
+          filename:
+            mpp-format-string: '{artifact_name_prefix}-gcp.{arch}.tar.gz'

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

@@ -64,6 +64,7 @@ pipelines:
               name:raw-hyperv-image:
                 file: disk.img
         options:
-          filename: hyperv
+          filename:
+            mpp-format-string: '{artifact_name_prefix}-hyperv.{arch}.vhdx'
           format:
             type: vhdx

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

@@ -90,7 +90,8 @@ pipelines:
         options:
           paths:
             - from: input://tree/disk.img
-              to: tree:///metal
+              to:
+                mpp-format-string: 'tree:///{artifact_name_prefix}-metal.{arch}.raw'
   - name: raw-metal4k-image
     build:
       mpp-format-string: '{buildroot}'
@@ -183,4 +184,5 @@ pipelines:
         options:
           paths:
             - from: input://tree/disk.img
-              to: tree:///metal4k
+              to:
+                mpp-format-string: 'tree:///{artifact_name_prefix}-metal4k.{arch}.raw'

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

@@ -288,7 +288,8 @@ pipelines:
               name:raw-qemu-secex-image:
                 file: disk.img
         options:
-          filename: qemu-secex
+          filename:
+            mpp-format-string: '{artifact_name_prefix}-qemu-secex.{arch}.qcow2'
           format:
             type: qcow2
             compression: false