opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-22 01:48:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

ginkgo testing: fix podman usernamespace join

Browse Source 
When there is a podman pause process running the local podman ginkgo
tests will join the usernamespace. This because pkg/rootless will
automatically join the ns on startup when possible. To fix this we
need to use the remote build tag which disables that behavior.

However since the remote tag is also used in the e2e test itself we
would always run remote tests which is wrong, this is fixed by using a
new `remote_testing` tag for the test.

see discussion here: https://github.com/containers/podman/pull/16309#discussion_r1006166930

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
This commit is contained in:
Paul Holzinger
2022-10-27 15:16:19 +02:00
parent 47bcd10f61
commit d50a55233a
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -539,7 +539,7 @@ test: localunit localintegration remoteintegration localsystem remotesystem ##
.PHONY: ginkgo-run
ginkgo-run:
ACK_GINKGO_RC=true ginkgo version
ACK_GINKGO_RC=true ginkgo -v $(TESTFLAGS) -tags "$(TAGS)" $(GINKGOTIMEOUT) -cover -flakeAttempts 3 -progress -trace -noColor -nodes $(GINKGONODES) -debug $(GINKGOWHAT) $(HACK)
ACK_GINKGO_RC=true ginkgo -v $(TESTFLAGS) -tags "$(TAGS) remote" $(GINKGOTIMEOUT) -cover -flakeAttempts 3 -progress -trace -noColor -nodes $(GINKGONODES) -debug $(GINKGOWHAT) $(HACK)
.PHONY: ginkgo
ginkgo:
@ -547,7 +547,7 @@ ginkgo:
.PHONY: ginkgo-remote
ginkgo-remote:
$(MAKE) ginkgo-run TAGS="$(REMOTETAGS)" HACK=
$(MAKE) ginkgo-run TAGS="$(REMOTETAGS) remote_testing" HACK=
.PHONY: localintegration
localintegration: test-binaries ginkgo

4
test/e2e/libpod_suite_remote_test.go
View File

@ -1,5 +1,5 @@
//go:build remote
// +build remote
//go:build remote_testing
// +build remote_testing
package integration

4
test/e2e/libpod_suite_test.go
View File

@ -1,5 +1,5 @@
//go:build !remote
// +build !remote
//go:build !remote_testing
// +build !remote_testing
package integration

4
test/e2e/play_build_test.go
View File

@ -1,5 +1,5 @@
//go:build !remote
// +build !remote
//go:build !remote_testing
// +build !remote_testing
// build for play kube is not supported on remote yet.

4
test/e2e/run_apparmor_test.go
View File

@ -1,5 +1,5 @@
//go:build !remote
// +build !remote
//go:build !remote_testing
// +build !remote_testing
package integration