Skip to content

imgtestlib: handle missing sources key in tests#2447

Merged
achilleas-k merged 1 commit into
osbuild:mainfrom
avitova:safe-access-curl2
Jun 23, 2026
Merged

imgtestlib: handle missing sources key in tests#2447
achilleas-k merged 1 commit into
osbuild:mainfrom
avitova:safe-access-curl2

Conversation

@avitova

@avitova avitova commented Jun 19, 2026

Copy link
Copy Markdown
Contributor

Prevent a KeyError crash when accessing org.osbuild.curl for missing sources.

This commit also reconciles dropped changes in imgtestlib.

During the time when the imgtestlib split PR was open [1], some changes were merged and the PR had to be rebased. During the rebase, I (AK) missed some of the changes that were already merged, essentially reverting them.

I went through all functions that were in the monolithic imgtestlib and made sure to bring in all changes that were dropped and adapted them to newer changes.

[1] #2383

@avitova avitova requested review from a team, achilleas-k and thozza as code owners June 19, 2026 13:14
@avitova avitova requested a review from supakeen June 19, 2026 13:14
achilleas-k
achilleas-k previously approved these changes Jun 19, 2026

@achilleas-k achilleas-k left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Thanks for cleaning up the mess :)

lzap
lzap previously approved these changes Jun 22, 2026
@achilleas-k

Copy link
Copy Markdown
Member

Ugh, sorry for breaking your PR (again). It seems I missed something in a recent change to the install-dependencies script.
https://gitlab.com/redhat/services/products/image-builder/ci/images/-/jobs/14975989981#L2902

RHEL 7 builds on CentOS 9 machines, and boot testing the qcow2, which we're now doing in this PR with the removal of the jq check, requires cloud-localds, which isn't being installed on the runner.

I'll re-add the jq check, even though it's not needed, so we can get this fixed and everything else unblocked.

Prevent a KeyError crash when accessing org.osbuild.curl for missing
sources.

This commit also reconciles dropped changes in imgtestlib.

During the time when the imgtestlib split PR was open [1], some changes
were merged and the PR had to be rebased. During the rebase, I (AK)
missed some of the changes that were already merged, essentially
reverting them.

I went through all functions that were in the monolithic imgtestlib and
made sure to bring in all changes that were dropped and adapted them to
newer changes.

[1] osbuild#2383

Co-authored-by: Achilleas Koutsou <achilleas@koutsou.net>
@achilleas-k achilleas-k dismissed stale reviews from lzap and themself via a4b9c72 June 22, 2026 17:34
@avitova avitova requested a review from lzap June 23, 2026 08:12

@lzap lzap left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Thank you for looking into this.

@achilleas-k achilleas-k added this pull request to the merge queue Jun 23, 2026
Merged via the queue into osbuild:main with commit 8b58523 Jun 23, 2026
54 checks passed
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