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

Globally increase test timeout to 90-minutes

Browse Source 
Signed-off-by: Chris Evich <cevich@redhat.com>
This commit is contained in:
Chris Evich
2019-03-04 13:18:10 -05:00
parent 34bf58c5db
commit e6e6cb384c
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -44,7 +44,7 @@ LIBSECCOMP_COMMIT := release-2.3
# Rarely if ever should integration tests take more than 50min, # Rarely if ever should integration tests take more than 50min,
# caller may override in special circumstances if needed. # caller may override in special circumstances if needed.
GINKGOTIMEOUT ?= -timeout=50m GINKGOTIMEOUT ?= -timeout=90m
# If GOPATH not specified, use one in the local directory # If GOPATH not specified, use one in the local directory
ifeq ($(GOPATH),) ifeq ($(GOPATH),)

2
contrib/cirrus/integration_test.sh
View File

@ -19,7 +19,7 @@ case "${OS_RELEASE_ID}-${OS_RELEASE_VER}" in
ubuntu-18) ubuntu-18)
make install PREFIX=/usr ETCDIR=/etc make install PREFIX=/usr ETCDIR=/etc
make test-binaries make test-binaries
SKIP_USERNS=1 make localintegration GINKGOTIMEOUT=90m SKIP_USERNS=1 make localintegration
;; ;;
fedora-29) ;& # Continue to the next item fedora-29) ;& # Continue to the next item
fedora-28) ;& fedora-28) ;&