Improve test coverage for `prepare` plugins in image mode#4719

Merged

happz merged 27 commits intomainfrom

Apr 22, 2026

Contributor

thrix commented Mar 19, 2026 •

edited

Loading

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

thrix added test coverage ci | full test plugin | install labels

gemini-code-assist Bot reviewed

View reviewed changes

Contributor

gemini-code-assist Bot left a comment

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.

tests/images.sh Outdated

thrix marked this pull request as draft

March 19, 2026 07:42

LecrisUT added this to planning

github-project-automation Bot moved this to backlog in planning

LecrisUT moved this from backlog to implement in planning

thrix force-pushed the issue-4606 branch 2 times, most recently from 65f03c7 to 022036b Compare

March 22, 2026 12:05

thrix commented

View reviewed changes

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

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

LecrisUT reviewed

View reviewed changes

plans/provision/virtual.fmf Outdated

plans/provision/virtual.fmf Outdated

plans/provision/virtual.fmf Outdated

tests/prepare/install/test.sh Outdated

.packit.yaml Outdated

tests/prepare/install/test.sh Outdated

tests/prepare/install/test.sh Outdated

tests/prepare/install/test.sh Outdated

tests/prepare/install/test.sh Outdated

tests/prepare/install/test.sh Outdated

thrix requested review from LecrisUT and thrix-bot

March 26, 2026 01:09

Contributor Author

thrix commented Mar 26, 2026

@gemini-code-assist please review

gemini-code-assist Bot reviewed

View reviewed changes

Contributor

gemini-code-assist Bot left a comment

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.

thrix force-pushed the issue-4606 branch 2 times, most recently from 0a72ea2 to 221d6c3 Compare

March 26, 2026 02:29

LecrisUT reviewed

View reviewed changes

.packit.yaml Outdated

tests/prepare/install/test.sh Outdated

tests/prepare/recommend/test.sh

tests/prepare/install/test.sh Outdated

tests/prepare/install/test.sh Outdated

tests/prepare/install/test.sh Outdated

tests/prepare/install/test.sh Outdated

thrix force-pushed the issue-4606 branch from 221d6c3 to a1bcf6c Compare

March 26, 2026 16:38

thrix-bot commented Mar 26, 2026

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

This comment was marked as resolved.

Sign in to view

thrix and others added 25 commits

April 22, 2026 20:10


          Move the is_image mode test next to is_ostree

d6c86b5

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


          Use for to iterate over a space delimited string

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


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

3f49237

This reverts commit 05d59b0.


          The images should be newline separated

0b04395

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


          Update .packit.yaml

7484cbc

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


          Fix some tests

74838be

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


          fix tests

899eb93

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


          Address a few review comments

b0ff516

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


          Address review comments, improve prepare/shell test

Script from remote url is broken, see #4785

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


          Fix tests

5dee735

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


          Fix prepare shell tests

7a764d1

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


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

d9158f9

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


          Fix shell tests

209fbd1

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


          Add todo item for #4806

0de15be

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


          Update according to review

cd8ccc9

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


          Fix fetch_downloaded_packages clobbering global $image variable

e3c71d1

The `image` and `in_subdirectory` variables in
`fetch_downloaded_packages()` were not declared `local`, so when
`IMAGE_MODE=yes` the function overwrote the global loop `$image`
(e.g. from the full qcow2 URL to `fedora:44`). Subsequent phases
like "Install existing and invalid packages" then saw the wrong
value, causing `is_image_mode` to return false and the test to
check the wrong error message assertion.

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


          Fix shell test to use paths reasonable for image mode

d443f3c

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


          fixup

e8b55e1

hopefully the last fix for the Multiple Commandline Scripts


          fixup

0480f91

fix-multi-script


          fixup

a3fba30

fix-multi-script


          Adjust packit job name, fix adjust rules to skip plans for image mode

f093346

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


          fix tests by limiting them to fedora

0f03947

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


          revert debugging code

c6138df

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


          Add because to adjust rules

14a29d5

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


          fixup

53476cd

English

happz force-pushed the issue-4606 branch from 8e7eda7 to 53476cd Compare

April 22, 2026 18:10

Contributor

happz commented Apr 22, 2026

Linkcheck failed because of target site being down, merging.

happz merged commit 5465197 into main

31 of 33 checks passed

happz deleted the issue-4606 branch

April 22, 2026 19:37

github-project-automation Bot moved this from merge to done in planning

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

graphite-app[bot] graphite-app[bot] left review comments

happz happz approved these changes

LecrisUT LecrisUT approved these changes

psss Awaiting requested review from psss

thrix-bot Awaiting requested review from thrix-bot

+1 more reviewer

gemini-code-assist[bot] gemini-code-assist[bot] left review comments

Labels

ci | full test plugin | install test coverage