From 133421eecec4975dda6aacd2c1bcbc14ec593718 Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Fri, 15 Nov 2024 14:45:36 -0500 Subject: [PATCH] osbuild: use new host_as_buildroot var when configuring the buildroot This makes it a little more explicit. --- .../coreos.osbuild.aarch64.mpp.yaml | 19 ++++++++++--------- .../coreos.osbuild.ppc64le.mpp.yaml | 19 ++++++++++--------- .../coreos.osbuild.s390x.mpp.yaml | 19 ++++++++++--------- .../coreos.osbuild.x86_64.mpp.yaml | 19 ++++++++++--------- 4 files changed, 40 insertions(+), 36 deletions(-) diff --git a/src/osbuild-manifests/coreos.osbuild.aarch64.mpp.yaml b/src/osbuild-manifests/coreos.osbuild.aarch64.mpp.yaml index d8330a009d..958969b420 100644 --- a/src/osbuild-manifests/coreos.osbuild.aarch64.mpp.yaml +++ b/src/osbuild-manifests/coreos.osbuild.aarch64.mpp.yaml @@ -25,15 +25,6 @@ mpp-vars: boot_fs_label: boot root_fs_uuid: 910678ff-f77e-4a7d-8d53-86f2ac47a823 root_fs_label: root - # 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. - buildroot: - mpp-if: osname in ['rhcos', 'scos'] - then: "name:deployed-tree" - else: "" # 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). @@ -43,6 +34,16 @@ mpp-vars: # 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 use the host as the + # buildroot there. + buildroot: + mpp-if: osname in ['rhcos', 'scos'] + then: "name:deployed-tree" + else: + mpp-format-string: '{host_as_buildroot}' mpp-define-images: - id: image sector_size: diff --git a/src/osbuild-manifests/coreos.osbuild.ppc64le.mpp.yaml b/src/osbuild-manifests/coreos.osbuild.ppc64le.mpp.yaml index b371e3d08a..5354a05fc2 100644 --- a/src/osbuild-manifests/coreos.osbuild.ppc64le.mpp.yaml +++ b/src/osbuild-manifests/coreos.osbuild.ppc64le.mpp.yaml @@ -25,15 +25,6 @@ mpp-vars: boot_fs_label: boot root_fs_uuid: 910678ff-f77e-4a7d-8d53-86f2ac47a823 root_fs_label: root - # 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. - buildroot: - mpp-if: osname in ['rhcos', 'scos'] - then: "name:deployed-tree" - else: "" # 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). @@ -43,6 +34,16 @@ mpp-vars: # 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 use the host as the + # buildroot there. + buildroot: + mpp-if: osname in ['rhcos', 'scos'] + then: "name:deployed-tree" + else: + mpp-format-string: '{host_as_buildroot}' mpp-define-images: - id: image sector_size: diff --git a/src/osbuild-manifests/coreos.osbuild.s390x.mpp.yaml b/src/osbuild-manifests/coreos.osbuild.s390x.mpp.yaml index 556da8f168..680c47f4ae 100644 --- a/src/osbuild-manifests/coreos.osbuild.s390x.mpp.yaml +++ b/src/osbuild-manifests/coreos.osbuild.s390x.mpp.yaml @@ -29,15 +29,6 @@ mpp-vars: boot_fs_label: boot root_fs_uuid: 910678ff-f77e-4a7d-8d53-86f2ac47a823 root_fs_label: root - # 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. - buildroot: - mpp-if: osname in ['rhcos', 'scos'] - then: "name:deployed-tree" - else: "" # 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). @@ -47,6 +38,16 @@ mpp-vars: # 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 use the host as the + # buildroot there. + buildroot: + mpp-if: osname in ['rhcos', 'scos'] + then: "name:deployed-tree" + else: + mpp-format-string: '{host_as_buildroot}' mpp-define-images: - id: image sector_size: diff --git a/src/osbuild-manifests/coreos.osbuild.x86_64.mpp.yaml b/src/osbuild-manifests/coreos.osbuild.x86_64.mpp.yaml index 9b0f1b977d..8f4bb57be0 100644 --- a/src/osbuild-manifests/coreos.osbuild.x86_64.mpp.yaml +++ b/src/osbuild-manifests/coreos.osbuild.x86_64.mpp.yaml @@ -25,15 +25,6 @@ mpp-vars: boot_fs_label: boot root_fs_uuid: 910678ff-f77e-4a7d-8d53-86f2ac47a823 root_fs_label: root - # 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. - buildroot: - mpp-if: osname in ['rhcos', 'scos'] - then: "name:deployed-tree" - else: "" # 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). @@ -43,6 +34,16 @@ mpp-vars: # 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 use the host as the + # buildroot there. + buildroot: + mpp-if: osname in ['rhcos', 'scos'] + then: "name:deployed-tree" + else: + mpp-format-string: '{host_as_buildroot}' mpp-define-images: - id: image sector_size: