Skip to content

tests: some more storage.conf rewrite prep#6714

Merged
Luap99 merged 2 commits intocontainers:mainfrom
Luap99:storage-conf-prep
Mar 11, 2026
Merged

tests: some more storage.conf rewrite prep#6714
Luap99 merged 2 commits intocontainers:mainfrom
Luap99:storage-conf-prep

Conversation

@Luap99
Copy link
Member

@Luap99 Luap99 commented Mar 10, 2026

What this PR does / why we need it:

More preparation work for containers/container-libs#680, I like to get them merged in advance so the container-libs PR will not break the vendor for others once it gets merged.
Commits were tested in #6708 already.

How to verify it

Which issue(s) this PR fixes:

Special notes for your reviewer:

Does this PR introduce a user-facing change?

None

Luap99 added 2 commits March 10, 2026 17:51
Because the new storage.conf parsing will always read the storage.conf
file also under $HOME it means in this unshare env it tries to access
/root which will not work due missing permissions.

To work around set CONTAINERS_STORAGE_CONF=/dev/null to make it not
parse the normal storage.conf locations here. The tests are using their
own storage options via the cli anyway so this should not alter the
behavior.

This is need in preparation for the storage.conf rewrite[1].

[1] containers/container-libs#680

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
This option is not actually used in GetStore() for anything. It only is
used during config parsing in storage.conf but that is of no relevance
here.

Context: I remove this option for the storage.conf rework [1] and
as it does not do anything we can already remove it to avoid breaking
the compile for the vendor step once the upstream PR is merged.

[1] containers/container-libs#680

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
@dosubot dosubot bot added the size:S This PR changes 10-29 lines, ignoring generated files. label Mar 10, 2026
Copy link
Member

@nalind nalind left a comment

Choose a reason for hiding this comment

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

LGTM

@Luap99
Copy link
Member Author

Luap99 commented Mar 11, 2026

@TomSweeneyRedHat @Honny1 PTAL

Copy link
Member

@Honny1 Honny1 left a comment

Choose a reason for hiding this comment

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

LGTM, as far as I can tell.

@Luap99 Luap99 merged commit b3f04da into containers:main Mar 11, 2026
40 checks passed
@Luap99 Luap99 deleted the storage-conf-prep branch March 11, 2026 17:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size:S This PR changes 10-29 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants