container/podman
container/podman
1
0
Fork 0
mirror of https://github.com/containers/podman synced 2024-10-22 10:13:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2528 from cevich/more_time

Browse source 
Globally increase test timeout to 90-minutes
This commit is contained in:
OpenShift Merge Robot 2019-03-05 06:34:03 -08:00 committed by GitHub
parent b62540c6d5 e6e6cb384c
commit 645426fe79
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show stats 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,
# 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),)

2
contrib/cirrus/integration_test.sh
View file

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