Skip to content

osbuild-manifests: enable kubevirt image for s390x #4093

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

osbuild-manifests: enable kubevirt image for s390x #4093

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/osbuild-manifests/coreos.osbuild.s390x.mpp.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -672,3 +672,5 @@ pipelines:
path: platform.qemu-secex.ipp.yaml
- mpp-import-pipelines:
path: platform.live.ipp.yaml
- mpp-import-pipelines:
path: platform.kubevirt.ipp.yaml
35 changes: 35 additions & 0 deletions src/osbuild-manifests/platform.kubevirt.ipp.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,41 @@ pipelines:
partition:
mpp-format-int: '{image.layout[''boot''].partnum}'
target: /boot
- mpp-if: arch == 's390x'
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In the other platforms where we have this we also have this comment above which I think is useful:

      # If on s390x then run zipl, which must run after the kernel
      # arguments get finalized in the coreos.platform stage above

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

also, if you rebase on top of latest :main I think it will fix the CI failures.

then:
type: org.osbuild.zipl.inst
options:
kernel: "1"
kernel_opts_append:
- ignition.firstboot
location:
mpp-format-int: '{image.layout[''boot''].start}'
devices:
disk:
type: org.osbuild.loopback
options:
filename: disk.img
partscan: true
mounts:
- name: root
type: org.osbuild.xfs
source: disk
partition:
mpp-format-int: '{image.layout[''root''].partnum}'
target: /
- name: boot
type: org.osbuild.ext4
source: disk
partition:
mpp-format-int: '{image.layout[''boot''].partnum}'
target: /boot
inputs:
disk_image:
type: org.osbuild.files
origin: org.osbuild.pipeline
references:
name:raw-kubevirt-image:
file: disk.img
- name: qemu-kubevirt-image
build:
mpp-format-string: '{host_as_buildroot}'
Expand Down
Loading