summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-03-05 06:34:03 -0800
committerGitHub <noreply@github.com>2019-03-05 06:34:03 -0800
commit645426fe797f90fc75712388e0373158f13bab0a (patch)
treeb71d724eca80cf4b05d0e5bbc4c13e4b592f5785 /Makefile
parentb62540c6d5a424d3396dd097dd695c3dfb2db6ce (diff)
parente6e6cb384cf3ea0d2d0dcd4994567ecf29bc481d (diff)
downloadpodman-645426fe797f90fc75712388e0373158f13bab0a.tar.gz
podman-645426fe797f90fc75712388e0373158f13bab0a.tar.bz2
podman-645426fe797f90fc75712388e0373158f13bab0a.zip
Merge pull request #2528 from cevich/more_time
Globally increase test timeout to 90-minutes
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index c215022a4..cb351f917 100644
--- a/Makefile
+++ b/Makefile
@@ -44,7 +44,7 @@ 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
+GINKGOTIMEOUT ?= -timeout=90m
# If GOPATH not specified, use one in the local directory
ifeq ($(GOPATH),)