Skip to content

fixes to have test-*-local Makefile targets work #2654

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.

Sign up for GitHub

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

Merged
merged 4 commits into from
Aug 29, 2025
Merged

fixes to have test-*-local Makefile targets work #2654

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bb1f057
Makefile: validate-local depends on tools
lsm5 Jul 16, 2025
7e235ea
Makefile: test-system-local checks for SKOPEO_BINARY
lsm5 Jul 23, 2025
02055fb
Makefile: inline logic for test-integration-local
lsm5 Aug 25, 2025
19f1202
TMT: run systemtest via `make test-system-local`
lsm5 Aug 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,10 +201,11 @@ test-integration:
$(MAKE) test-integration-local


# Intended for CI, assumed to be running in quay.io/libpod/skopeo_cidev container.
# Primarily intended for CI.
test-integration-local: bin/skopeo
hack/warn-destructive-tests.sh
hack/test-integration.sh $(SKOPEO_LDFLAGS) $(TESTFLAGS)
$(MAKE) PREFIX=/usr install
cd ./integration && $(GO) test $(SKOPEO_LDFLAGS) $(TESTFLAGS) $(if $(BUILDTAGS),-tags "$(BUILDTAGS)")

# complicated set of options needed to run podman-in-podman
test-system:
Expand All @@ -218,10 +219,11 @@ test-system:
$(CONTAINER_RUNTIME) unshare rm -rf $$DTEMP; # This probably doesn't work with Docker, oh well, better than nothing... \
exit $$rc

# Intended for CI, assumed to already be running in quay.io/libpod/skopeo_cidev container.
test-system-local: bin/skopeo
# Primarily intended for CI.
test-system-local: $(if $(SKOPEO_BINARY),,bin/skopeo)
hack/warn-destructive-tests.sh
hack/test-system.sh SKOPEO_LDFLAGS="$(SKOPEO_LDFLAGS)" BUILDTAGS="$(BUILDTAGS)"
@echo "Testing with $(or $(SKOPEO_BINARY),$(eval SKOPEO_BINARY := "bin/skopeo")$(SKOPEO_BINARY)) ..."
Copy link
Contributor

@mtrmac mtrmac Aug 29, 2025

Choose a reason for hiding this comment

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

AFAICS this does not export SKOPEO_BINARY as an environment variable, so the eval only affects the printed path here. Was that intentional?

(In practice it ultimately works the same, systemtest/helpers.bash defaults to essentially $(pwd)/bin/skopeo anyway.)

Copy link
Member Author

@lsm5 lsm5 Aug 29, 2025

Choose a reason for hiding this comment

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

Yes, this was only meant to echo SKOPEO_BINARY if it's set or just use the default bin/skopeo so we know which binary is actually being tested. We're setting SKOPEO_BINARY in the TMT tests.

bats --tap systemtest

test-unit:
# Just call (make test unit-local) here instead of worrying about environment differences
Expand All @@ -234,7 +236,7 @@ validate:
test-all-local: validate-local validate-docs test-unit-local

.PHONY: validate-local
validate-local:
validate-local: tools
hack/validate-git-marks.sh
hack/validate-gofmt.sh
$(GOBIN)/golangci-lint run --build-tags "${BUILDTAGS}"
Expand Down
8 changes: 0 additions & 8 deletions hack/test-integration.sh
View file
Open in desktop

This file was deleted.

44 changes: 0 additions & 44 deletions hack/test-system.sh
View file
Open in desktop

This file was deleted.

6 changes: 5 additions & 1 deletion systemtest/tmt/main.fmf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,9 @@ adjust:
RELEASE_TESTING: true

summary: System test
test: bash ./test.sh
test: |
rpm -q containers-common skopeo skopeo-tests
# If these tests are to be run anywhere else, TMT can fetch
# them using the URL and git ref, so git commands should work.
make -C $(git rev-parse --show-toplevel) test-system-local
duration: 60m
13 changes: 0 additions & 13 deletions systemtest/tmt/test.sh
View file
Open in desktop

This file was deleted.