Improve test coverage for `prepare` plugins in image mode by thrix · Pull Request #4719 · teemtee/tmt

thrix · 2026-03-19T07:40:26Z

Incorporate the image mode testing into the plugins' tests and remove the separate bootc specific testing.
Running the plugins test exercises all the cases as in package mode and provides good confidence about the
image mode testing support.

The testing is done against F44 and CS10 image mode cloud base images provided by Testing Farm.

Run the testing in a separate /provision/virtual-image-mode plan, because the testing will similar
time to run as /provision/virtual.

Fixes #4606

Pull Request Checklist

implement the feature
extend the test coverage

Assisted-by: Claude Code

gemini-code-assist

Code Review

This pull request significantly improves test coverage for prepare plugins in image mode by refactoring existing tests and adding new ones for bootc-based guests. It also implements missing methods in the Bootc package manager to support these tests. The changes are well-structured and the new test infrastructure is a valuable addition. I have one suggestion to simplify some of the new shell helper functions for better readability.

LecrisUT · 2026-03-24T15:33:51Z

Sign in to view

-        if [ "$PROVISION_HOW" = "container" ] && rlIsFedora 43 && is_fedora_43 "$image"; then
+        if ([ "$PROVISION_HOW" = "container" ] && rlIsFedora 43 && is_fedora_43 "$image") || is_image_mode "$image"; then


Why should a special is_image_mode here be done?

The original condition was container-only. Image mode was added because it supports local RPM installation via a different code path (Containerfile COPY + RUN dnf install), which is worth testing separately from repo-based installation.

Well, I am not sure where the confusion is, but the below tests run only against a container provisioner now. I want to run them on image mode, because they handling is special there and it is worth testing. Also, one of the cases tested should be testing the case we fixed in https://github.com/teemtee/tmt/pull/4598/files.

Then put it next to the PROVSION_HOW check, not globally or-ed

it would not match rlIsFedora 43 && is_fedora_43 "$image" ...

it would not match rlIsFedora 43 && is_fedora_43 "$image" ...

Yes, I'm aware, and that's a separate issue to be resolved for the exact same reasons.

I am lost what do you want here, please provide a snippet. We want to run this:

one of the container images (fedora 43 now)

on image mode

Have the test run solely on rlIsFedora 43 && is_fedora_43 "$image" check (or a better equivalent one that we should add)

The rlIsFedora in here does not seem right, it would make more sense to gate it on the packit/plan side, in line with Move /plans/provision/container into its own Packit job #4400

The time-saved is miniscule when you compare https://artifacts.dev.testing-farm.io/c209da29-bb97-43e7-9636-bbe55a46db04/ with https://artifacts.dev.testing-farm.io/e5345cba-e5d8-4f95-be6c-b7cb4639b2a1/

[[ "$PROVISION_HOW" = "container" || is_image_mode "$image" ]]

The comments indicate that both branches are intentional and should be kept as-is in a future refactoring

Overall the intent in this section is unclear and the change looks more like slapping a duct-tape on top of a pile of duct-tapes. If we come back to re-organizing this test, how should this be split, what is meaningful to run, etc., it would make our future selves jobs easier.

thrix · 2026-03-26T01:09:57Z

@gemini-code-assist please review

gemini-code-assist

Code Review

This pull request introduces comprehensive support for 'image-mode' guests within the TMT framework. Key changes include updating .packit.yaml and plans/provision/virtual.fmf to define a new provision-virtual-image-mode job and FMF plan, along with adding specific image definitions and helper functions in tests/images.sh. The testing infrastructure has been significantly adapted across tests/prepare/install/test.sh, tests/prepare/recommend/test.sh, and tests/prepare/shell/test.sh to accommodate image-mode specific behaviors like Containerfile builds, image switches, and reboot persistence. Core package management logic for image-mode guests, including COPR repository handling and package installation, has been implemented in tmt/package_managers/bootc.py. Several old test files related to bootc and CentOS Stream 10 have been removed.

Sign in to view

-        if [ "$PROVISION_HOW" = "container" ] && rlIsFedora 43 && is_fedora_43 "$image"; then
+        if ([ "$PROVISION_HOW" = "container" ] && rlIsFedora 43 && is_fedora_43 "$image") || is_image_mode "$image"; then


thrix-bot · 2026-03-26T16:39:07Z

Fixed the provision-virtual-image-mode test failures:

COPR tests failing (Just enable copr on both CentOS Stream 10 and Fedora 44 image mode): The case-insensitive is_fedora/is_centos helpers now correctly match image mode images, which caused them to enter the copr/escape/debuginfo test block. But enable_copr() isn't implemented in the bootc package manager yet (moved to Add enable_copr, create_repository, and install_repository to bootc package manager #4748). Fixed by skipping the copr block for image mode with a TODO referencing Add enable_copr, create_repository, and install_repository to bootc package manager #4748.
provision-virtual failure (8afb9020): All 17 individual tests passed — the overall failure appears to be a TF infrastructure issue, not related to this PR.

Assisted-by: Claude Code

LecrisUT · 2026-04-07T16:07:04Z

Btw, what do we do with the diverging naming conventions bootc vs image-mode. Shouldn't this be provision-virtual-bootc?

thrix · 2026-04-08T02:00:21Z

Btw, what do we do with the diverging naming conventions bootc vs image-mode. Shouldn't this be provision-virtual-bootc?

I would opt calling this image-mode to mitigate the confusion with the bootc provision plugin. It already caused that confusion at the beginning of this review.

LecrisUT · 2026-04-08T08:02:01Z

Btw, what do we do with the diverging naming conventions bootc vs image-mode. Shouldn't this be provision-virtual-bootc?

I would opt calling this image-mode to mitigate the confusion with the bootc provision plugin. It already caused that confusion at the beginning of this review.

Did it create a confusion? Isn't the whole point of virtual-(bootc|image-mode) to disambiguate it. To me it would feel more confusing down the line as if we are distinguishing between bootc and image-mode. Another option is virtual-with-bootc

Remove standalone `tests/prepare/bootc/` and extend existing plugin tests (`prepare/install`, `prepare/shell`, `prepare/recommend`) with image mode coverage on CentOS Stream 10 and Fedora 44 bootc images. - `enable_copr()` — installs copr plugin via Containerfile (since `/usr` is read-only), then runs `dnf copr enable` on the live system to write `.repo` to `/etc`. - `create_repository()`, `install_repository()` — delegate to `aux_engine` to run on the live system. Not directly tested, will be exercised when `prepare/artifact` tests are extended. Existing tests gain `IS_IMAGE_MODE` handling and run against image mode images when triggered by the new `/plans/provision/virtual/image-mode` sub-plan. Reboot persistence is verified through a dedicated `reboot-persistence` inner plan that installs packages, reboots via `tmt-reboot`, and re-verifies. A single reboot test is sufficient — all install variants (repo, local RPM, COPR, etc.) go through the same bootc mechanism (Containerfile rebuild → `bootc switch` → reboot), so if packages survive a reboot in one case, they survive in all. - `prepare/artifact`, `prepare/require` — currently `provision-container` only - `prepare/ansible`, `prepare/feature/epel,fips,profile` — need Ansible support in image mode (#4636) - `prepare/distgit` — test refactoring needed Pull Request Checklist * [x] implement the feature * [x] extend the test coverage Assisted-by: Claude Code Signed-off-by: Miroslav Vadkerti <mvadkert@redhat.com>

Signed-off-by: Miroslav Vadkerti <mvadkert@redhat.com>

This reverts commit 05d59b0.

Signed-off-by: Miroslav Vadkerti <mvadkert@redhat.com>

Co-authored-by: Cristian Le <git@lecris.dev>

Signed-off-by: Miroslav Vadkerti <mvadkert@redhat.com>

Script from remote url is broken, see #4785 Signed-off-by: Miroslav Vadkerti <mvadkert@redhat.com>

Signed-off-by: Miroslav Vadkerti <mvadkert@redhat.com>

thrix added test coverage Improvements or additions to test coverage of tmt itself ci | full test Pull request is ready for the full test execution plugin | install The prepare plugin for installing packages labels Mar 19, 2026

gemini-code-assist bot reviewed Mar 19, 2026

View reviewed changes

Comment thread tests/images.sh Outdated

thrix marked this pull request as draft March 19, 2026 07:42

LecrisUT added this to planning Mar 19, 2026

github-project-automation bot moved this to backlog in planning Mar 19, 2026

LecrisUT moved this from backlog to implement in planning Mar 19, 2026

thrix force-pushed the issue-4606 branch 2 times, most recently from 65f03c7 to 022036b Compare March 22, 2026 12:05

thrix commented Mar 22, 2026

View reviewed changes

Comment thread plans/provision/virtual.fmf Outdated

thrix force-pushed the issue-4606 branch from 022036b to 1d17684 Compare March 22, 2026 12:14

thrix marked this pull request as ready for review March 23, 2026 12:15

thrix moved this from implement to review in planning Mar 23, 2026

thrix force-pushed the issue-4606 branch from 70166b6 to 53fd123 Compare March 23, 2026 12:19

thrix requested review from LecrisUT, happz and psss March 24, 2026 00:17

psss added this to the 1.70 milestone Mar 24, 2026

LecrisUT reviewed Mar 24, 2026

View reviewed changes

thrix requested review from LecrisUT and thrix-bot March 26, 2026 01:09

gemini-code-assist bot reviewed Mar 26, 2026

View reviewed changes

thrix force-pushed the issue-4606 branch 2 times, most recently from 0a72ea2 to 221d6c3 Compare March 26, 2026 02:29

LecrisUT reviewed Mar 26, 2026

View reviewed changes

thrix force-pushed the issue-4606 branch from 221d6c3 to a1bcf6c Compare March 26, 2026 16:38

This comment was marked as resolved.

Sign in to view

thrix moved this from review to implement in planning Apr 1, 2026

LecrisUT mentioned this pull request Apr 7, 2026

Move /plans/provision/container into its own Packit job #4400

Open

8 tasks

thrix force-pushed the issue-4606 branch from e7ff4a1 to f19513b Compare April 8, 2026 00:33

This was referenced Apr 8, 2026

/tests/prepare/recommend would deserve refactoring #4786

Open

Consolidate conditions in /tests/prepare/install test #4787

Open

thrix modified the milestones: 1.71, 1.72 Apr 9, 2026

thrix force-pushed the issue-4606 branch from a878f84 to 870e5e8 Compare April 14, 2026 23:41

thrix mentioned this pull request Apr 15, 2026

Move feature plugin package installs to Python for image mode support #4800

Draft

8 tasks

thrix and others added 12 commits April 17, 2026 03:14

Addressed next round of review comments

3ecb058

Signed-off-by: Miroslav Vadkerti <mvadkert@redhat.com>

Move the is_image mode test next to is_ostree

de6adeb

Signed-off-by: Miroslav Vadkerti <mvadkert@redhat.com>

Use for to iterate over a space delimited string

aca65f2

Signed-off-by: Miroslav Vadkerti <mvadkert@redhat.com>

Revert "Use for to iterate over a space delimited string"

6fec70c

This reverts commit 05d59b0.

The images should be newline separated

5141f05

Signed-off-by: Miroslav Vadkerti <mvadkert@redhat.com>

Update .packit.yaml

fa47fdb

Co-authored-by: Cristian Le <git@lecris.dev>

Fix some tests

5dfbb38

Signed-off-by: Miroslav Vadkerti <mvadkert@redhat.com>

fix tests

f6aecda

Signed-off-by: Miroslav Vadkerti <mvadkert@redhat.com>

Address a few review comments

57bc82b

Signed-off-by: Miroslav Vadkerti <mvadkert@redhat.com>

Address review comments, improve prepare/shell test

542b3ae

Script from remote url is broken, see #4785 Signed-off-by: Miroslav Vadkerti <mvadkert@redhat.com>

Fix tests

b2bfbea

Signed-off-by: Miroslav Vadkerti <mvadkert@redhat.com>

thrix force-pushed the issue-4606 branch from 870e5e8 to b2bfbea Compare April 17, 2026 01:14

thrix added 3 commits April 17, 2026 03:48

Fix prepare shell tests

f90a863

Signed-off-by: Miroslav Vadkerti <mvadkert@redhat.com>

More anchors in packit.yaml, do not run irrelevants plans in image mode

64bdd14

Signed-off-by: Miroslav Vadkerti <mvadkert@redhat.com>

Fix shell tests

3dfe7b4

Signed-off-by: Miroslav Vadkerti <mvadkert@redhat.com>

		if [ "$PROVISION_HOW" = "container" ] && rlIsFedora 43 && is_fedora_43 "$image"; then
		if ([ "$PROVISION_HOW" = "container" ] && rlIsFedora 43 && is_fedora_43 "$image") \|\| is_image_mode "$image"; then

Conversation

thrix commented Mar 19, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

gemini-code-assist bot left a comment

Choose a reason for hiding this comment

Code Review

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

LecrisUT Mar 24, 2026

Choose a reason for hiding this comment

Uh oh!

thrix-bot Mar 26, 2026

Choose a reason for hiding this comment

Uh oh!

This comment was marked as duplicate.

Uh oh!

thrix Mar 27, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

LecrisUT Mar 30, 2026

Choose a reason for hiding this comment

Uh oh!

thrix Mar 30, 2026

Choose a reason for hiding this comment

Uh oh!

LecrisUT Mar 30, 2026

Choose a reason for hiding this comment

Uh oh!

thrix Apr 17, 2026

Choose a reason for hiding this comment

Uh oh!

LecrisUT Apr 17, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

thrix commented Mar 26, 2026

Uh oh!

gemini-code-assist bot left a comment

Choose a reason for hiding this comment

Code Review

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

This comment was marked as duplicate.

Uh oh!

thrix-bot commented Mar 26, 2026

Uh oh!

This comment was marked as resolved.

LecrisUT commented Apr 7, 2026

Uh oh!

thrix commented Apr 8, 2026

Uh oh!

LecrisUT commented Apr 8, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

thrix commented Mar 19, 2026 •

edited

Loading

thrix Mar 27, 2026 •

edited

Loading