Skip to content
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

Remove image-info and use it from osbuild #4543

Merged
merged 5 commits into from
Jan 31, 2025

Conversation

achilleas-k
Copy link
Member

The image-info tool is now included in the osbuild repo and packaged in osbuild-tools. This PR removes the tool from this repository and updates all calls to it to use the one from osbuild, which installs to /usr/bin/osbuild-image-info.

@achilleas-k
Copy link
Member Author

Needs new repo snapshots (#4542).

mvo5
mvo5 previously approved these changes Jan 6, 2025
Copy link
Contributor

@mvo5 mvo5 left a comment

Choose a reason for hiding this comment

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

Looks very nice, thank you!

Copy link
Member

@thozza thozza left a comment

Choose a reason for hiding this comment

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

LGTM, just one small issue that I missed the last time 😇

test/cases/image_tests.sh Outdated Show resolved Hide resolved
thozza
thozza previously approved these changes Jan 9, 2025
Copy link
Member

@thozza thozza left a comment

Choose a reason for hiding this comment

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

LGTM 👍

@achilleas-k
Copy link
Member Author

achilleas-k commented Jan 9, 2025

Needs new repo snapshots (#4542).

Newer snapshot PR: #4550.

mvo5
mvo5 previously approved these changes Jan 9, 2025
Copy link
Contributor

@mvo5 mvo5 left a comment

Choose a reason for hiding this comment

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

Love it!

@achilleas-k
Copy link
Member Author

achilleas-k commented Jan 29, 2025

With #4568 merged, this should be good to go now.

EDIT: I forgot, we also need #4569 for the newer snapshots.

@achilleas-k achilleas-k dismissed stale reviews from mvo5 and thozza via 506be3c January 30, 2025 10:53
@achilleas-k achilleas-k requested review from mvo5 and thozza January 30, 2025 10:54
@achilleas-k
Copy link
Member Author

Rebased and fixed conflicts

Update osbuild commit ID to include image info, which now installs as
/usr/bin/osbuild-image-info.
The image-info tool now lives in osbuild/osbuild.
Call the script without a path since it's now in the PATH.

Drop the SELinux labelling workaround (chcon) from filesystem.sh and
image_tests.sh.  The packaged tool is already labelled correctly.

Install osbuild-tools instead of osbuild-composer-tests in
regression-old-worker-new-composer.sh to get osbuild-image-info.
@achilleas-k
Copy link
Member Author

Missed one case where osbuild-composer-tests was installed to get image-info in regression-old-worker-new-composer.sh. Fixed it now.

Copy link
Member

@thozza thozza left a comment

Choose a reason for hiding this comment

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

Amazing 🤩

@thozza thozza merged commit 083d84f into osbuild:main Jan 31, 2025
43 of 46 checks passed
@achilleas-k achilleas-k deleted the rm/image-info branch January 31, 2025 08:41
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