-
Notifications
You must be signed in to change notification settings - Fork 10
ci: bootc end-to-end support #114
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
Conversation
Avoids repeating the value. The defined `TOX_ARGS` was previously unused.
Ubuntu 24.04's podman 4.9.3 does not work with the bootc-image-builder container: Bind-mounting the container storage into it makes the container's podman 5 fail with a storage error. Thus install podman 5.4 from Ubuntu 25.04 to regain compatibility. This is rather hackish, but as that is a stable release, it should not break in the future (wrt. library dependencies and such).
These tests run the role during a bootc container image build, deploy the container into a QEMU VM, boot that, and validate the expected configuration there. They run in two different tox environments, and thus have to be run in two steps (preparation in buildah, validation in QEMU). The preparation is expected to output a qcow2 image in `tests/tmp/TESTNAME/qcow2/disk.qcow2`, i.e. the output structure of <https://github.com/osbuild/bootc-image-builder>. There are two possibilities: * Have separate bootc end-to-end tests. These are tagged with `tests::bootc-e2` and are skipped in the normal qemu-* scenarios. They run as part of the container-* ones. * Modify an existing test: These need to build a qcow2 image exactly *once* (via calling `bootc-buildah-qcow.sh`) and skip setup/cleanup and role invocations in validation mode, i.e. when `__bootc_validation` is true. In the container scenario, run the QEMU validation as a separate step in the workflow. See https://issues.redhat.com/browse/RHEL-88396
Reviewer's GuideThis PR enhances the CI workflows to support bootc end-to-end tests by conditionally upgrading podman, extending the tox invocation to accept bootc-specific arguments, adding a new QEMU-based bootc validation step, and bumping the tox-lsr version to 3.10.0. Sequence Diagram: Bootc E2E Test Execution in CIsequenceDiagram
participant GHA as "GitHub Actions Workflow"
participant Runner as "CI Runner"
participant PodmanSvc as "Podman Service"
participant ToxEngine as "Tox Engine"
participant QEMU_Bootc as "QEMU (for Bootc)"
GHA->>Runner: Start E2E Tests
Runner->>Runner: Checkout Code
opt Podman Upgrade Required
Runner->>PodmanSvc: Upgrade Podman
PodmanSvc-->>Runner: Podman Ready
end
Runner->>ToxEngine: Execute tests (with bootc args, using tox-lsr 3.10.0)
ToxEngine->>QEMU_Bootc: Run QEMU-based bootc validation
QEMU_Bootc-->>ToxEngine: Validation Result
ToxEngine-->>Runner: Test Suite Result
Runner-->>GHA: Report CI Status
File-Level Changes
Tips and commandsInteracting with Sourcery
Customizing Your ExperienceAccess your dashboard to:
Getting Help
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hey @martinpitt - I've reviewed your changes and they look great!
Here's what I looked at during the review
- 🟢 General issues: all looks good
- 🟢 Security: all looks good
- 🟢 Review instructions: all looks good
- 🟢 Testing: all looks good
- 🟢 Documentation: all looks good
Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.
These were applied in linux-system-roles/sudo#59 and lay the groundwork for adding bootc end-to-end tests. The changes are backwards compatible and no-ops for roles without e2e tests. Preferably they can get mass-deployed, to avoid having to cherry-pick all these changes manually.
Summary by Sourcery
Enable bootc end-to-end tests by extending the QEMU CI workflow with Podman 5.x support, customizable tox arguments, and a new validation step for bootc images, and bump tox-lsr to version 3.10.0.
CI: