diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-02-06 14:00:38 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-06 14:00:38 +0100 |
| commit | e249966e72cfda9fbf7222fe6747d9f918ca6f69 (patch) | |
| tree | 8d9d9364efbdd9e6e2880df6722cb7b0f61448a8 | |
| parent | d321c5d942f85b56852532edfd225dcdd591f817 (diff) | |
| parent | ede38d3600d85eabb03624ba5ce215eb4eeff1af (diff) | |
| download | podman-e249966e72cfda9fbf7222fe6747d9f918ca6f69.tar.gz podman-e249966e72cfda9fbf7222fe6747d9f918ca6f69.tar.bz2 podman-e249966e72cfda9fbf7222fe6747d9f918ca6f69.zip | |
Merge pull request #2270 from cevich/fail_faster
Apply 45min timeout to integration tests
| -rw-r--r-- | Makefile | 8 |
1 files changed, 6 insertions, 2 deletions
@@ -42,6 +42,10 @@ ISODATE ?= $(shell date --iso-8601) #Update to LIBSECCOMP_COMMIT should reflect in Dockerfile too. LIBSECCOMP_COMMIT := release-2.3 +# Rarely if ever should integration tests take more than 50min, +# caller may override in special circumstances if needed. +GINKGOTIMEOUT ?= -timeout=50m + # If GOPATH not specified, use one in the local directory ifeq ($(GOPATH),) export GOPATH := $(CURDIR)/_output @@ -171,10 +175,10 @@ localunit: test/goecho/goecho varlink_generate $(MAKE) -C contrib/cirrus/packer test ginkgo: - ginkgo -v -tags "$(BUILDTAGS)" -cover -flakeAttempts 3 -progress -trace -noColor test/e2e/. + ginkgo -v -tags "$(BUILDTAGS)" $(GINKGOTIMEOUT) -cover -flakeAttempts 3 -progress -trace -noColor test/e2e/. ginkgo-remote: - ginkgo -v -tags "$(BUILDTAGS) remoteclient" -cover -flakeAttempts 3 -progress -trace -noColor test/e2e/. + ginkgo -v -tags "$(BUILDTAGS) remoteclient" $(GINKGOTIMEOUT) -cover -flakeAttempts 3 -progress -trace -noColor test/e2e/. localintegration: varlink_generate test-binaries ginkgo ginkgo-remote |