opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-09-12 01:38:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16322 from Luap99/remote-ginkgo

Browse Source 
ginkgo testing: fix podman usernamespace join
This commit is contained in:
OpenShift Merge Robot
2022-10-27 13:47:23 -04:00
committed by GitHub
parent c577fe3150 d50a55233a
commit 0c38fc826d
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 .PHONY: ginkgo-run
ginkgo-run: ginkgo-run:
ACK_GINKGO_RC=true ginkgo version 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 .PHONY: ginkgo
ginkgo: ginkgo:
@ -547,7 +547,7 @@ ginkgo:
.PHONY: ginkgo-remote .PHONY: ginkgo-remote
ginkgo-remote: ginkgo-remote:
$(MAKE) ginkgo-run TAGS="$(REMOTETAGS)" HACK= $(MAKE) ginkgo-run TAGS="$(REMOTETAGS) remote_testing" HACK=
.PHONY: localintegration .PHONY: localintegration
localintegration: test-binaries ginkgo localintegration: test-binaries ginkgo

4
test/e2e/libpod_suite_remote_test.go
View File

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

4
test/e2e/libpod_suite_test.go
View File

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

4
test/e2e/play_build_test.go
View File

@ -1,5 +1,5 @@
//go:build !remote //go:build !remote_testing
// +build !remote // +build !remote_testing
// build for play kube is not supported on remote yet. // 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 //go:build !remote_testing
// +build !remote // +build !remote_testing
package integration package integration