Skip to content

Commit

Permalink
osbuild: rename build pipeline to plain-files-tree
Browse files Browse the repository at this point in the history
We're using it as more than just a buildroot now. We're more just
using it as a way to inspect and copy from or load configuration
from in various places because the files are laid out in a plain
directory structure. Let's rename it to more appropriately reflect
what it is, which might explain why we use it in various places.
  • Loading branch information
dustymabe committed Nov 15, 2024
1 parent 088bc14 commit 8a85d7d
Show file tree
Hide file tree
Showing 5 changed files with 70 additions and 50 deletions.
29 changes: 17 additions & 12 deletions src/osbuild-manifests/coreos.osbuild.aarch64.mpp.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ mpp-vars:
# the host (COSA) gets used as the buildroot there.
buildroot:
mpp-if: osname in ['rhcos', 'scos']
then: "name:build"
then: "name:plain-files-tree"
else: ""
# For the qemu stages we'll use the host buildroot (COSA)
# because we definitely don't include qemu-img in CoreOS. ""
Expand Down Expand Up @@ -109,12 +109,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 plain 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: plain-files-tree
stages:
- mpp-if: ociarchive != ''
then:
Expand Down Expand Up @@ -152,7 +157,7 @@ pipelines:
type: org.osbuild.tree
origin: org.osbuild.pipeline
references:
- name:build
- name:plain-files-tree
- type: org.osbuild.ostree.init-fs
- type: org.osbuild.ostree.os-init
options:
Expand Down Expand Up @@ -366,7 +371,7 @@ pipelines:
type: org.osbuild.tree
origin: org.osbuild.pipeline
references:
- name:build
- name:plain-files-tree
devices:
disk:
type: org.osbuild.loopback
Expand All @@ -389,7 +394,7 @@ pipelines:
type: org.osbuild.tree
origin: org.osbuild.pipeline
references:
- name:build
- name:plain-files-tree
devices:
disk:
type: org.osbuild.loopback
Expand Down Expand Up @@ -618,7 +623,7 @@ pipelines:
type: org.osbuild.tree
origin: org.osbuild.pipeline
references:
- name:build
- name:plain-files-tree
devices:
disk:
type: org.osbuild.loopback
Expand All @@ -643,7 +648,7 @@ pipelines:
type: org.osbuild.tree
origin: org.osbuild.pipeline
references:
- name:build
- name:plain-files-tree
devices:
disk:
type: org.osbuild.loopback
Expand Down
29 changes: 17 additions & 12 deletions src/osbuild-manifests/coreos.osbuild.ppc64le.mpp.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ mpp-vars:
# the host (COSA) gets used as the buildroot there.
buildroot:
mpp-if: osname in ['rhcos', 'scos']
then: "name:build"
then: "name:plain-files-tree"
else: ""
# For the qemu stages we'll use the host buildroot (COSA)
# because we definitely don't include qemu-img in CoreOS. ""
Expand Down Expand Up @@ -111,12 +111,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 plain 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: plain-files-tree
stages:
- mpp-if: ociarchive != ''
then:
Expand Down Expand Up @@ -154,7 +159,7 @@ pipelines:
type: org.osbuild.tree
origin: org.osbuild.pipeline
references:
- name:build
- name:plain-files-tree
- type: org.osbuild.ostree.init-fs
- type: org.osbuild.ostree.os-init
options:
Expand Down Expand Up @@ -351,7 +356,7 @@ pipelines:
type: org.osbuild.tree
origin: org.osbuild.pipeline
references:
- name:build
- name:plain-files-tree
devices:
disk:
type: org.osbuild.loopback
Expand All @@ -374,7 +379,7 @@ pipelines:
type: org.osbuild.tree
origin: org.osbuild.pipeline
references:
- name:build
- name:plain-files-tree
devices:
disk:
type: org.osbuild.loopback
Expand Down Expand Up @@ -572,7 +577,7 @@ pipelines:
type: org.osbuild.tree
origin: org.osbuild.pipeline
references:
- name:build
- name:plain-files-tree
devices:
disk:
type: org.osbuild.loopback
Expand All @@ -597,7 +602,7 @@ pipelines:
type: org.osbuild.tree
origin: org.osbuild.pipeline
references:
- name:build
- name:plain-files-tree
devices:
disk:
type: org.osbuild.loopback
Expand Down
29 changes: 17 additions & 12 deletions src/osbuild-manifests/coreos.osbuild.s390x.mpp.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ mpp-vars:
# the host (COSA) gets used as the buildroot there.
buildroot:
mpp-if: osname in ['rhcos', 'scos']
then: "name:build"
then: "name:plain-files-tree"
else: ""
# For the qemu stages we'll use the host buildroot (COSA)
# because we definitely don't include qemu-img in CoreOS. ""
Expand Down Expand Up @@ -101,12 +101,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 plain 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: plain-files-tree
stages:
- mpp-if: ociarchive != ''
then:
Expand Down Expand Up @@ -144,7 +149,7 @@ pipelines:
type: org.osbuild.tree
origin: org.osbuild.pipeline
references:
- name:build
- name:plain-files-tree
- type: org.osbuild.ostree.init-fs
- type: org.osbuild.ostree.os-init
options:
Expand Down Expand Up @@ -354,7 +359,7 @@ pipelines:
type: org.osbuild.tree
origin: org.osbuild.pipeline
references:
- name:build
- name:plain-files-tree
devices:
disk:
type: org.osbuild.loopback
Expand All @@ -377,7 +382,7 @@ pipelines:
type: org.osbuild.tree
origin: org.osbuild.pipeline
references:
- name:build
- name:plain-files-tree
devices:
disk:
type: org.osbuild.loopback
Expand Down Expand Up @@ -546,7 +551,7 @@ pipelines:
type: org.osbuild.tree
origin: org.osbuild.pipeline
references:
- name:build
- name:plain-files-tree
devices:
disk:
type: org.osbuild.loopback
Expand All @@ -571,7 +576,7 @@ pipelines:
type: org.osbuild.tree
origin: org.osbuild.pipeline
references:
- name:build
- name:plain-files-tree
devices:
disk:
type: org.osbuild.loopback
Expand Down
29 changes: 17 additions & 12 deletions src/osbuild-manifests/coreos.osbuild.x86_64.mpp.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ mpp-vars:
# the host (COSA) gets used as the buildroot there.
buildroot:
mpp-if: osname in ['rhcos', 'scos']
then: "name:build"
then: "name:plain-files-tree"
else: ""
# For the qemu stages we'll use the host buildroot (COSA)
# because we definitely don't include qemu-img in CoreOS. ""
Expand Down Expand Up @@ -111,12 +111,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 plain 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: plain-files-tree
stages:
- mpp-if: ociarchive != ''
then:
Expand Down Expand Up @@ -154,7 +159,7 @@ pipelines:
type: org.osbuild.tree
origin: org.osbuild.pipeline
references:
- name:build
- name:plain-files-tree
- type: org.osbuild.ostree.init-fs
- type: org.osbuild.ostree.os-init
options:
Expand Down Expand Up @@ -368,7 +373,7 @@ pipelines:
type: org.osbuild.tree
origin: org.osbuild.pipeline
references:
- name:build
- name:plain-files-tree
devices:
disk:
type: org.osbuild.loopback
Expand All @@ -391,7 +396,7 @@ pipelines:
type: org.osbuild.tree
origin: org.osbuild.pipeline
references:
- name:build
- name:plain-files-tree
devices:
disk:
type: org.osbuild.loopback
Expand Down Expand Up @@ -622,7 +627,7 @@ pipelines:
type: org.osbuild.tree
origin: org.osbuild.pipeline
references:
- name:build
- name:plain-files-tree
devices:
disk:
type: org.osbuild.loopback
Expand All @@ -647,7 +652,7 @@ pipelines:
type: org.osbuild.tree
origin: org.osbuild.pipeline
references:
- name:build
- name:plain-files-tree
devices:
disk:
type: org.osbuild.loopback
Expand Down
4 changes: 2 additions & 2 deletions src/osbuild-manifests/platform.qemu-secex.ipp.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ pipelines:
type: org.osbuild.tree
origin: org.osbuild.pipeline
references:
- name:build
- name:plain-files-tree
devices:
disk:
type: org.osbuild.loopback
Expand All @@ -165,7 +165,7 @@ pipelines:
type: org.osbuild.tree
origin: org.osbuild.pipeline
references:
- name:build
- name:plain-files-tree
devices:
disk:
type: org.osbuild.loopback
Expand Down

0 comments on commit 8a85d7d

Please sign in to comment.