osbuild: copy in platforms.json into /boot

This is something create_disk.sh was doing that we weren't in the OSBuild flow today. It will make it so `coreos-installer` can pick up and use this information when performing installs and should support the efforts to make the ext.config.files.console-config test start passing again. xref coreos/fedora-coreos-tracker#1654
coreos · Feb 5, 2024 · ade15b9 · ade15b9
1 parent 30bce85
commit ade15b9
Show file tree

Hide file tree

Showing 4 changed files with 84 additions and 0 deletions.
diff --git a/src/coreos.osbuild.aarch64.mpp.yaml b/src/coreos.osbuild.aarch64.mpp.yaml
@@ -111,6 +111,12 @@ pipelines:
           paths:
             - path: /boot/efi
               mode: 448
+      # platforms.json will live here
+      - type: org.osbuild.mkdir
+        options:
+          paths:
+            - path: /boot/coreos
+              mode: 644
       - type: org.osbuild.ignition
       # Deploy via container if we have a container ociarchive, else from repo.
       - mpp-if: ociarchive != ''
@@ -168,6 +174,21 @@ pipelines:
             ref: ostree/1/1/0
             osname:
               mpp-format-string: '{osname}'
+      # Copy in the platforms.json that was baked into the OSTree into /boot
+      # so tools like coreos-installer can use the information.
+      - type: org.osbuild.copy
+        options:
+          paths:
+            - from: tree:///usr/share/coreos-assembler/platforms.json
+              to: tree:///boot/coreos/platforms.json
+        mounts:
+          - name: ostree.deployment
+            type: org.osbuild.ostree.deployment
+            options:
+              deployment:
+                ref: ostree/1/1/0
+                osname:
+                  mpp-format-string: '{osname}'
   - name: raw-image
     stages:
       - type: org.osbuild.truncate

diff --git a/src/coreos.osbuild.ppc64le.mpp.yaml b/src/coreos.osbuild.ppc64le.mpp.yaml
@@ -108,6 +108,12 @@ pipelines:
               bootloader: none
               # https://github.com/coreos/fedora-coreos-tracker/issues/1333
               bls-append-except-default: grub_users=""
+      # platforms.json will live here
+      - type: org.osbuild.mkdir
+        options:
+          paths:
+            - path: /boot/coreos
+              mode: 644
       - type: org.osbuild.ignition
       # Deploy via container if we have a container ociarchive, else from repo.
       - mpp-if: ociarchive != ''
@@ -178,6 +184,21 @@ pipelines:
             ref: ostree/1/1/0
             osname:
               mpp-format-string: '{osname}'
+      # Copy in the platforms.json that was baked into the OSTree into /boot
+      # so tools like coreos-installer can use the information.
+      - type: org.osbuild.copy
+        options:
+          paths:
+            - from: tree:///usr/share/coreos-assembler/platforms.json
+              to: tree:///boot/coreos/platforms.json
+        mounts:
+          - name: ostree.deployment
+            type: org.osbuild.ostree.deployment
+            options:
+              deployment:
+                ref: ostree/1/1/0
+                osname:
+                  mpp-format-string: '{osname}'
   - name: raw-image
     stages:
       - type: org.osbuild.truncate

diff --git a/src/coreos.osbuild.s390x.mpp.yaml b/src/coreos.osbuild.s390x.mpp.yaml
@@ -95,6 +95,12 @@ pipelines:
               bootloader: none
              ## no grub_users="" on s390x
              #bls-append-except-default: grub_users=""
+      # platforms.json will live here
+      - type: org.osbuild.mkdir
+        options:
+          paths:
+            - path: /boot/coreos
+              mode: 644
       - type: org.osbuild.ignition
       # Deploy via container if we have a container ociarchive, else from repo.
       - mpp-if: ociarchive != ''
@@ -176,6 +182,21 @@ pipelines:
             ref: ostree/1/1/0
             osname:
               mpp-format-string: '{osname}'
+      # Copy in the platforms.json that was baked into the OSTree into /boot
+      # so tools like coreos-installer can use the information.
+      - type: org.osbuild.copy
+        options:
+          paths:
+            - from: tree:///usr/share/coreos-assembler/platforms.json
+              to: tree:///boot/coreos/platforms.json
+        mounts:
+          - name: ostree.deployment
+            type: org.osbuild.ostree.deployment
+            options:
+              deployment:
+                ref: ostree/1/1/0
+                osname:
+                  mpp-format-string: '{osname}'
   - name: raw-image
     stages:
       - type: org.osbuild.truncate

diff --git a/src/coreos.osbuild.x86_64.mpp.yaml b/src/coreos.osbuild.x86_64.mpp.yaml
@@ -113,6 +113,12 @@ pipelines:
           paths:
             - path: /boot/efi
               mode: 448
+      # platforms.json will live here
+      - type: org.osbuild.mkdir
+        options:
+          paths:
+            - path: /boot/coreos
+              mode: 644
       - type: org.osbuild.ignition
       # Deploy via container if we have a container ociarchive, else from repo.
       - mpp-if: ociarchive != ''
@@ -170,6 +176,21 @@ pipelines:
             ref: ostree/1/1/0
             osname:
               mpp-format-string: '{osname}'
+      # Copy in the platforms.json that was baked into the OSTree into /boot
+      # so tools like coreos-installer can use the information.
+      - type: org.osbuild.copy
+        options:
+          paths:
+            - from: tree:///usr/share/coreos-assembler/platforms.json
+              to: tree:///boot/coreos/platforms.json
+        mounts:
+          - name: ostree.deployment
+            type: org.osbuild.ostree.deployment
+            options:
+              deployment:
+                ref: ostree/1/1/0
+                osname:
+                  mpp-format-string: '{osname}'
   - name: raw-image
     stages:
       - type: org.osbuild.truncate