Skip to content

Fix test-system and remove stale Makefile target#2731

Merged
mtrmac merged 3 commits into
containers:mainfrom
lsm5:test-system-fix
Nov 5, 2025
Merged

Fix test-system and remove stale Makefile target#2731
mtrmac merged 3 commits into
containers:mainfrom
lsm5:test-system-fix

Conversation

@lsm5
Copy link
Copy Markdown
Member

@lsm5 lsm5 commented Oct 27, 2025

Obsoletes #2729 and #2730 . See individual commits.

Doesn't depend on automation_images so this can go in.

@lsm5 lsm5 marked this pull request as ready for review October 27, 2025 00:59
@lsm5
Copy link
Copy Markdown
Member Author

lsm5 commented Oct 27, 2025

@mtrmac PTAL

@TomSweeneyRedHat
Copy link
Copy Markdown
Member

LGTM

Copy link
Copy Markdown
Contributor

@mtrmac mtrmac left a comment

Choose a reason for hiding this comment

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

Thanks!

LGTM apart from the nits, but maybe revisit #2725 first, in case you wanted both PRs to be merged simultaneously.

Comment thread hack/test-system.sh Outdated
Comment thread Makefile Outdated
`hack/test-system.sh` earlier removed in commit 7e235ea contained
a storage.conf setup useful for running system tests in skopeo_cidev
container.

Getting rid of that also broke `make test-system` because the
systemtest: `copy: additional tag` started to break.

Running `make test-system-local` isn't ideal for local environments due
to creation of system-global containers with predictable names.
See: containers#2701 (comment)

So, this commit resurrects hack/test-system.sh. Followup commit will
modify Makefile targets to use this script again.

Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
@lsm5
Copy link
Copy Markdown
Member Author

lsm5 commented Nov 5, 2025

LGTM apart from the nits, but maybe revisit #2725 first, in case you wanted both PRs to be merged simultaneously.

I think this can go in independently.

lsm5 and others added 2 commits November 5, 2025 13:36
This will ensure both `test-system` and `test-system-local` work.

The `test-system` target will use the skopeo binary at `./bin/skopeo`.
Setting SKOPEO_BINARY should have no effect on it.

The `test-system-local` (and `test-integration-local`) target can use
SKOPEO_BINARY at any location. This will be useful in CI where we need to test
skopeo installed by the package at /usr/bin.

Co-authored-by: Miloslav Trmač <mitr@redhat.com>
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
Old cruft. Isn't even expected to work. Not used anywhere.

Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
@lsm5
Copy link
Copy Markdown
Member Author

lsm5 commented Nov 5, 2025

@mtrmac applied your suggestion. Thanks a lot! This is ready to go.

@mtrmac mtrmac merged commit 00de3af into containers:main Nov 5, 2025
39 checks passed
@lsm5 lsm5 deleted the test-system-fix branch November 5, 2025 19:54
@stale-locking-app stale-locking-app Bot locked as resolved and limited conversation to collaborators Feb 4, 2026
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants