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

make: install ostree-container as a multicall hardlinked binary #3293

Merged
merged 1 commit into from
Dec 21, 2021

Conversation

lucab
Copy link
Contributor

@lucab lucab commented Dec 21, 2021

This installs the ostree-container multicall binary as an
hardlink to the existing rpm-ostree one.
It also adds a kola tests to make sure it is actually working
at runtime.

Ref: #3281

@@ -4,6 +4,15 @@ set -xeuo pipefail
. ${KOLA_EXT_DATA}/libtest.sh
cd $(mktemp -d)

# Ensure multicall is correctly set up and working.
if ! test $(which rpm-ostree) -ef $(which ostree-container); then
Copy link
Contributor Author

@lucab lucab Dec 21, 2021

Choose a reason for hiding this comment

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

This "same inode" test seems to fail on CI.
I'm unsure about why, but I think it's a side-effect of how we inject custom files into the image under test.
While slightly unfortunate, I'm going to convert this into a "same digest" check instead.

This installs the `ostree-container` multicall binary as an
hardlink to the existing `rpm-ostree` one.
It also adds a kola tests to make sure it is actually working
at runtime.
@lucab lucab force-pushed the ups/multicall-hardlink branch from b819b54 to 895fd52 Compare December 21, 2021 16:15
Copy link
Member

@cgwalters cgwalters left a comment

Choose a reason for hiding this comment

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

Nice!

@cgwalters cgwalters merged commit 9522904 into coreos:main Dec 21, 2021
@lucab lucab deleted the ups/multicall-hardlink branch December 22, 2021 08:14
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.

2 participants