-
Notifications
You must be signed in to change notification settings - Fork 5
ci: Add support for bootc end-to-end validation tests #53
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
Reviewer's GuideIntroduce bootc end-to-end validation by upgrading the CI’s tox-lsr version, adding an Ubuntu-specific Podman 5.x workaround, refining skip-tag logic for bootc tests in QEMU workflows, and appending a dedicated QEMU validation step that runs qcow2-based tests with the __bootc_validation flag. Sequence Diagram for Bootc End-to-End Test Execution FlowsequenceDiagram
participant GAW as GitHub Actions Workflow
participant ToxPrep as Tox (Preparation Env)
participant Script_Buildah as bootc-buildah-qcow.sh
participant ToxVal as Tox (Validation Env)
participant QEMU as QEMU VM
participant Scripts_VM as Test Scripts (in VM)
GAW->>ToxPrep: Run image preparation
ToxPrep->>Script_Buildah: Execute script
Script_Buildah->>Script_Buildah: Build container image using Buildah
Script_Buildah-->>ToxPrep: Return disk.qcow2
ToxPrep-->>GAW: Preparation complete (disk.qcow2 available)
GAW->>ToxVal: Run QEMU validation (with disk.qcow2, __bootc_validation=true)
ToxVal->>QEMU: Start VM with disk.qcow2
QEMU->>QEMU: Boot OS from image
QEMU->>Scripts_VM: Execute validation scripts
Scripts_VM->>Scripts_VM: Perform configuration checks
Scripts_VM-->>QEMU: Validation results
QEMU-->>ToxVal: VM execution results
ToxVal-->>GAW: Validation results
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 @richm - I've reviewed your changes - here's some feedback:
- Consolidate the repeated tox-lsr upgrade commands across workflows into a common CI template or reusable step to simplify future version bumps.
- Add a clear TODO or conditional guard for the Ubuntu plucky pinning hack so it’s automatically removed once upgrading to 26.04 LTS to avoid stale configuration.
- Extract the
Run bootc validation tests in QEMUlogic into a standalone script or composite action for better readability and maintainability.
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.
NOTE: This also requires upgrading to tox-lsr 3.10.0, and some hacks to workaround a podman issue in ubuntu. 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 Signed-off-by: Rich Megginson <rmeggins@redhat.com>
NOTE: This also requires upgrading to tox-lsr 3.10.0, and some
hacks to workaround a podman issue in ubuntu.
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 ofhttps://github.com/osbuild/bootc-image-builder.
There are two possibilities:
Have separate bootc end-to-end tests. These are tagged with
tests::bootc-e2and 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/cleanupand role invocations in validation mode, i.e. when
__bootc_validationis true.In the container scenario, run the QEMU validation as a separate step in
the workflow.
See https://issues.redhat.com/browse/RHEL-88396