Skip to content
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.

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

bib: remove usage of BootcLegacyDiskImage (for qemu-9.1) #689

Open
wants to merge 2 commits into
base: main
Choose a base branch
from

Conversation

mvo5
Copy link
Collaborator

@mvo5 mvo5 commented Oct 23, 2024

This commit enables bib to work with the qemu-9.1+openat2 patches as proposed in https://src.fedoraproject.org/rpms/qemu/pull-request/69.

With the qemu-user-statuc-aarch64 rpm produced by fedpkg mockbuild from this package the cross-arch test build works again.

$ sudo PYTHONPATH=. pytest './test/test_build.py::test_image_boots[quay.io/centos-bootc/centos-bootc:stream9,raw,CentOS Stream 9 ({arch}),arm64]' -s -vv
============================= test session starts ==============================
platform linux -- Python 3.12.7, pytest-7.4.3, pluggy-1.3.0 -- /usr/bin/python3
cachedir: .pytest_cache
rootdir: /home/mvogt/devel/osbuild/bootc-image-builder
configfile: pytest.ini
plugins: repeat-0.9.3, xdist-3.5.0
collected 1 item

test/test_build.py::test_image_boots[quay.io/centos-bootc/centos-bootc:stream9,raw,CentOS Stream 9 ({arch}),arm64] [1/2] STEP 1/9: FROM registry.fedoraproject.org/fedora:40 AS builder
...
PASSEDChecking disk usage for /var/tmp/bib-tests/shared0/68b20145da2cd3f2/image/disk.raw
NOTE: disk usage after /var/tmp/bib-tests/shared0/68b20145da2cd3f2/image/disk.raw: 712472.71936 / 1998694.907904
Untagged: quay.io/centos-bootc/centos-bootc:stream9
Deleted: 0de1f90b11cbe7e2768101f6c55b4dd9841c13a2f87c8d9c177aea74ade88050

============================= slowest 10 durations =============================
1033.54s setup    test/test_build.py::test_image_boots[quay.io/centos-bootc/centos-bootc:stream9,raw,CentOS Stream 9 ({arch}),arm64]
67.62s call     test/test_build.py::test_image_boots[quay.io/centos-bootc/centos-bootc:stream9,raw,CentOS Stream 9 ({arch}),arm64]
2.30s teardown test/test_build.py::test_image_boots[quay.io/centos-bootc/centos-bootc:stream9,raw,CentOS Stream 9 ({arch}),arm64]
======================== 1 passed in 1103.58s (0:18:23) ========================

This will also re-enable the cross-arch test via an updated qemu-user-static (same patches for the GH runners as we use for the f41 rpm packages of qemu)

@mvo5 mvo5 force-pushed the qemu-9-fc41 branch 15 times, most recently from 2967420 to 7abd07d Compare November 11, 2024 09:03
@achilleas-k achilleas-k self-requested a review November 11, 2024 10:45
@mvo5 mvo5 force-pushed the qemu-9-fc41 branch 2 times, most recently from 181f35e to 88b9e7a Compare November 11, 2024 17:36
@mvo5 mvo5 marked this pull request as ready for review November 11, 2024 17:36
@mvo5 mvo5 requested a review from ondrejbudai November 12, 2024 19:30
@ondrejbudai
Copy link
Member

Do you know if the fixed qemu package landed in the latest podman machine os?

@mvo5
Copy link
Collaborator Author

mvo5 commented Nov 13, 2024

Do you know if the fixed qemu package landed in the latest podman machine os?

Not yet, it seems podman machine is still at "Fedora CoreOS 40.20241019.2.0" - but even with that merging this should not have any ill consequences, podman machien will not yet work (until it moves to coreos 41) but cross building on fedora 41 will start working and even with the old pipeline we cannot currently cross build because ostree-rs started using openat2 so both the old and the new pipelines are not working today.

I could split this though and just merge the updated test and leave the old pipeline intact (not sure if that would be helpful though).

Copy link

This PR is stale because it has been open 30 days with no activity. Remove "Stale" label or comment or this will be closed in 7 days.

@github-actions github-actions bot added the Stale Issue or PR with no activity for extended period of time label Dec 14, 2024
@mvo5 mvo5 removed the Stale Issue or PR with no activity for extended period of time label Dec 16, 2024
@achilleas-k
Copy link
Member

Rebased and fixed the conflict.

Copy link
Member

@achilleas-k achilleas-k left a comment

Choose a reason for hiding this comment

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

LGTM!

@mvo5 mvo5 enabled auto-merge December 16, 2024 10:01
Copy link
Member

@ondrejbudai ondrejbudai left a comment

Choose a reason for hiding this comment

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

Thanks! :)

mvo5 added 2 commits December 18, 2024 14:13
This commit enables bib to work with the qemu-9.1+openat2 patches
as proposed in https://src.fedoraproject.org/rpms/qemu/pull-request/70.

With the qemu-user-statuc-aarch64 rpm produced by `fedpkg mockbuild`
from this package the cross-arch test build works again.
```
$ sudo PYTHONPATH=. pytest './test/test_build.py::test_image_boots[quay.io/centos-bootc/centos-bootc:stream9,raw,CentOS Stream 9 ({arch}),arm64]' -s -vv
============================= test session starts ==============================
platform linux -- Python 3.12.7, pytest-7.4.3, pluggy-1.3.0 -- /usr/bin/python3
cachedir: .pytest_cache
rootdir: /home/mvogt/devel/osbuild/bootc-image-builder
configfile: pytest.ini
plugins: repeat-0.9.3, xdist-3.5.0
collected 1 item

test/test_build.py::test_image_boots[quay.io/centos-bootc/centos-bootc:stream9,raw,CentOS Stream 9 ({arch}),arm64] [1/2] STEP 1/9: FROM registry.fedoraproject.org/fedora:40 AS builder
...
PASSEDChecking disk usage for /var/tmp/bib-tests/shared0/68b20145da2cd3f2/image/disk.raw
NOTE: disk usage after /var/tmp/bib-tests/shared0/68b20145da2cd3f2/image/disk.raw: 712472.71936 / 1998694.907904
Untagged: quay.io/centos-bootc/centos-bootc:stream9
Deleted: 0de1f90b11cbe7e2768101f6c55b4dd9841c13a2f87c8d9c177aea74ade88050

============================= slowest 10 durations =============================
1033.54s setup    test/test_build.py::test_image_boots[quay.io/centos-bootc/centos-bootc:stream9,raw,CentOS Stream 9 ({arch}),arm64]
67.62s call     test/test_build.py::test_image_boots[quay.io/centos-bootc/centos-bootc:stream9,raw,CentOS Stream 9 ({arch}),arm64]
2.30s teardown test/test_build.py::test_image_boots[quay.io/centos-bootc/centos-bootc:stream9,raw,CentOS Stream 9 ({arch}),arm64]
======================== 1 passed in 1103.58s (0:18:23) ========================
```
This commit adds the https://launchpad.net/~mvo/+archive/ubuntu/qemu/
PPA that contains a backport of the openat2 patches for qemu-9 so
that we can test cross-arch building again.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants