osbuild: rename build pipeline; use better variable names

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

@@ -25,21 +25,25 @@ mpp-vars:
   boot_fs_label: boot
   root_fs_uuid: 910678ff-f77e-4a7d-8d53-86f2ac47a823
   root_fs_label: root
+  # For some stages (i.e. the qemu stages) we'll use the host as
+  # the buildroot (i.e. COSA in most cases but sometimes just
+  # the actual HOST filesystem like in coreos/custom-coreos-disk-images).
+  # This is useful/necessary because we definitely don't include
+  # qemu-img or tools like zip in the actual CoreOS OS. "" here
+  # means to use the host as buildroot. It is worth noting that
+  # the host buildroot is the default if nothing is specified.
+  # We're still defining it here in an attempt to be explicit.
+  host_as_buildroot: ""
   # Set the buildroot string to use for most operations here. We create
   # the buildroot from the target OSTree contents so we have version
   # matches. Unfortunately for FCOS there is no python so we can't
-  # really use FCOS as the buildroot so we'll set it to "" so that
-  # the host (COSA) gets used as the buildroot there.
+  # really use FCOS as the buildroot so we'll use the host as the
+  # buildroot there.
   buildroot:
     mpp-if: osname in ['rhcos', 'scos']
-    then: "name:build"
-    else: ""
-  # For the qemu stages we'll use the host buildroot (COSA)
-  # because we definitely don't include qemu-img in CoreOS. ""
-  # means to use the host as buildroot. It is worth noting that
-  # the host buildroot is the default if nothing is specified.
-  # We're still defining it here in an attempt to be explicit.
-  qemu_stage_buildroot: ""
+    then: "name:deployed-tree"
+    else:
+      mpp-format-string: '{host_as_buildroot}'
 mpp-define-images:
   - id: image
     sector_size:
@@ -109,12 +113,17 @@ pipelines:
                 to: tree:///coreos.ociarchive
         else:
           type: org.osbuild.noop
-  # Construct a buildroot here from the input container reference (either
-  # ociarchive or registry/tag). Note that this is only used as a buildroot
-  # on RHCOS (FCOS doesn't ship python), but it is used everywhere as
-  # file_context input to the org.osbuild.selinux stages.
-  # unless used somewhere later in the manifest.
-  - name: build
+  # Construct a tree here that is a representation of the filesystem
+  # that you would see on a running OSTree system. i.e. instead of just
+  # /ostree and /sysroot at the toplevel we see /usr/ /var/ /etc/ ... that
+  # you would see inside an OSTree deployment. Having the plain files accessible
+  # allows for this pipeline to be used as a buildroot for some stages
+  # or as inputs for others (i.e. file_context input to the org.osbuild.selinux
+  # stages). This pipeline isn't actually used for built artifacts but
+  # to help during build.
+  #
+  # NOTE: this is only used as a buildroot on RHCOS (FCOS doesn't ship python).
+  - name: deployed-tree
     stages:
       - mpp-if: ociarchive != ''
         then:
@@ -152,7 +161,7 @@ pipelines:
             type: org.osbuild.tree
             origin: org.osbuild.pipeline
             references:
-              - name:build
+              - name:deployed-tree
       - type: org.osbuild.ostree.init-fs
       - type: org.osbuild.ostree.os-init
         options:
@@ -366,7 +375,7 @@ pipelines:
             type: org.osbuild.tree
             origin: org.osbuild.pipeline
             references:
-              - name:build
+              - name:deployed-tree
         devices:
           disk:
             type: org.osbuild.loopback
@@ -389,7 +398,7 @@ pipelines:
             type: org.osbuild.tree
             origin: org.osbuild.pipeline
             references:
-              - name:build
+              - name:deployed-tree
         devices:
           disk:
             type: org.osbuild.loopback
@@ -618,7 +627,7 @@ pipelines:
             type: org.osbuild.tree
             origin: org.osbuild.pipeline
             references:
-              - name:build
+              - name:deployed-tree
         devices:
           disk:
             type: org.osbuild.loopback
@@ -643,7 +652,7 @@ pipelines:
             type: org.osbuild.tree
             origin: org.osbuild.pipeline
             references:
-              - name:build
+              - name:deployed-tree
         devices:
           disk:
             type: org.osbuild.loopback

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

@@ -25,21 +25,25 @@ mpp-vars:
   boot_fs_label: boot
   root_fs_uuid: 910678ff-f77e-4a7d-8d53-86f2ac47a823
   root_fs_label: root
+  # For some stages (i.e. the qemu stages) we'll use the host as
+  # the buildroot (i.e. COSA in most cases but sometimes just
+  # the actual HOST filesystem like in coreos/custom-coreos-disk-images).
+  # This is useful/necessary because we definitely don't include
+  # qemu-img or tools like zip in the actual CoreOS OS. "" here
+  # means to use the host as buildroot. It is worth noting that
+  # the host buildroot is the default if nothing is specified.
+  # We're still defining it here in an attempt to be explicit.
+  host_as_buildroot: ""
   # Set the buildroot string to use for most operations here. We create
   # the buildroot from the target OSTree contents so we have version
   # matches. Unfortunately for FCOS there is no python so we can't
-  # really use FCOS as the buildroot so we'll set it to "" so that
-  # the host (COSA) gets used as the buildroot there.
+  # really use FCOS as the buildroot so we'll use the host as the
+  # buildroot there.
   buildroot:
     mpp-if: osname in ['rhcos', 'scos']
-    then: "name:build"
-    else: ""
-  # For the qemu stages we'll use the host buildroot (COSA)
-  # because we definitely don't include qemu-img in CoreOS. ""
-  # means to use the host as buildroot. It is worth noting that
-  # the host buildroot is the default if nothing is specified.
-  # We're still defining it here in an attempt to be explicit.
-  qemu_stage_buildroot: ""
+    then: "name:deployed-tree"
+    else:
+      mpp-format-string: '{host_as_buildroot}'
 mpp-define-images:
   - id: image
     sector_size:
@@ -111,12 +115,17 @@ pipelines:
                 to: tree:///coreos.ociarchive
         else:
           type: org.osbuild.noop
-  # Construct a buildroot here from the input container reference (either
-  # ociarchive or registry/tag). Note that this is only used as a buildroot
-  # on RHCOS (FCOS doesn't ship python), but it is used everywhere as
-  # file_context input to the org.osbuild.selinux stages.
-  # unless used somewhere later in the manifest.
-  - name: build
+  # Construct a tree here that is a representation of the filesystem
+  # that you would see on a running OSTree system. i.e. instead of just
+  # /ostree and /sysroot at the toplevel we see /usr/ /var/ /etc/ ... that
+  # you would see inside an OSTree deployment. Having the plain files accessible
+  # allows for this pipeline to be used as a buildroot for some stages
+  # or as inputs for others (i.e. file_context input to the org.osbuild.selinux
+  # stages). This pipeline isn't actually used for built artifacts but
+  # to help during build.
+  #
+  # NOTE: this is only used as a buildroot on RHCOS (FCOS doesn't ship python).
+  - name: deployed-tree
     stages:
       - mpp-if: ociarchive != ''
         then:
@@ -154,7 +163,7 @@ pipelines:
             type: org.osbuild.tree
             origin: org.osbuild.pipeline
             references:
-              - name:build
+              - name:deployed-tree
       - type: org.osbuild.ostree.init-fs
       - type: org.osbuild.ostree.os-init
         options:
@@ -351,7 +360,7 @@ pipelines:
             type: org.osbuild.tree
             origin: org.osbuild.pipeline
             references:
-              - name:build
+              - name:deployed-tree
         devices:
           disk:
             type: org.osbuild.loopback
@@ -374,7 +383,7 @@ pipelines:
             type: org.osbuild.tree
             origin: org.osbuild.pipeline
             references:
-              - name:build
+              - name:deployed-tree
         devices:
           disk:
             type: org.osbuild.loopback
@@ -572,7 +581,7 @@ pipelines:
             type: org.osbuild.tree
             origin: org.osbuild.pipeline
             references:
-              - name:build
+              - name:deployed-tree
         devices:
           disk:
             type: org.osbuild.loopback
@@ -597,7 +606,7 @@ pipelines:
             type: org.osbuild.tree
             origin: org.osbuild.pipeline
             references:
-              - name:build
+              - name:deployed-tree
         devices:
           disk:
             type: org.osbuild.loopback

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

@@ -29,21 +29,25 @@ mpp-vars:
   boot_fs_label: boot
   root_fs_uuid: 910678ff-f77e-4a7d-8d53-86f2ac47a823
   root_fs_label: root
+  # For some stages (i.e. the qemu stages) we'll use the host as
+  # the buildroot (i.e. COSA in most cases but sometimes just
+  # the actual HOST filesystem like in coreos/custom-coreos-disk-images).
+  # This is useful/necessary because we definitely don't include
+  # qemu-img or tools like zip in the actual CoreOS OS. "" here
+  # means to use the host as buildroot. It is worth noting that
+  # the host buildroot is the default if nothing is specified.
+  # We're still defining it here in an attempt to be explicit.
+  host_as_buildroot: ""
   # Set the buildroot string to use for most operations here. We create
   # the buildroot from the target OSTree contents so we have version
   # matches. Unfortunately for FCOS there is no python so we can't
-  # really use FCOS as the buildroot so we'll set it to "" so that
-  # the host (COSA) gets used as the buildroot there.
+  # really use FCOS as the buildroot so we'll use the host as the
+  # buildroot there.
   buildroot:
     mpp-if: osname in ['rhcos', 'scos']
-    then: "name:build"
-    else: ""
-  # For the qemu stages we'll use the host buildroot (COSA)
-  # because we definitely don't include qemu-img in CoreOS. ""
-  # means to use the host as buildroot. It is worth noting that
-  # the host buildroot is the default if nothing is specified.
-  # We're still defining it here in an attempt to be explicit.
-  qemu_stage_buildroot: ""
+    then: "name:deployed-tree"
+    else:
+      mpp-format-string: '{host_as_buildroot}'
 mpp-define-images:
   - id: image
     sector_size:
@@ -101,12 +105,17 @@ pipelines:
                 to: tree:///coreos.ociarchive
         else:
           type: org.osbuild.noop
-  # Construct a buildroot here from the input container reference (either
-  # ociarchive or registry/tag). Note that this is only used as a buildroot
-  # on RHCOS (FCOS doesn't ship python), but it is used everywhere as
-  # file_context input to the org.osbuild.selinux stages.
-  # unless used somewhere later in the manifest.
-  - name: build
+  # Construct a tree here that is a representation of the filesystem
+  # that you would see on a running OSTree system. i.e. instead of just
+  # /ostree and /sysroot at the toplevel we see /usr/ /var/ /etc/ ... that
+  # you would see inside an OSTree deployment. Having the plain files accessible
+  # allows for this pipeline to be used as a buildroot for some stages
+  # or as inputs for others (i.e. file_context input to the org.osbuild.selinux
+  # stages). This pipeline isn't actually used for built artifacts but
+  # to help during build.
+  #
+  # NOTE: this is only used as a buildroot on RHCOS (FCOS doesn't ship python).
+  - name: deployed-tree
     stages:
       - mpp-if: ociarchive != ''
         then:
@@ -144,7 +153,7 @@ pipelines:
             type: org.osbuild.tree
             origin: org.osbuild.pipeline
             references:
-              - name:build
+              - name:deployed-tree
       - type: org.osbuild.ostree.init-fs
       - type: org.osbuild.ostree.os-init
         options:
@@ -354,7 +363,7 @@ pipelines:
             type: org.osbuild.tree
             origin: org.osbuild.pipeline
             references:
-              - name:build
+              - name:deployed-tree
         devices:
           disk:
             type: org.osbuild.loopback
@@ -377,7 +386,7 @@ pipelines:
             type: org.osbuild.tree
             origin: org.osbuild.pipeline
             references:
-              - name:build
+              - name:deployed-tree
         devices:
           disk:
             type: org.osbuild.loopback
@@ -546,7 +555,7 @@ pipelines:
             type: org.osbuild.tree
             origin: org.osbuild.pipeline
             references:
-              - name:build
+              - name:deployed-tree
         devices:
           disk:
             type: org.osbuild.loopback
@@ -571,7 +580,7 @@ pipelines:
             type: org.osbuild.tree
             origin: org.osbuild.pipeline
             references:
-              - name:build
+              - name:deployed-tree
         devices:
           disk:
             type: org.osbuild.loopback