diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-03-05 06:34:03 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-05 06:34:03 -0800 |
| commit | 645426fe797f90fc75712388e0373158f13bab0a (patch) | |
| tree | b71d724eca80cf4b05d0e5bbc4c13e4b592f5785 | |
| parent | b62540c6d5a424d3396dd097dd695c3dfb2db6ce (diff) | |
| parent | e6e6cb384cf3ea0d2d0dcd4994567ecf29bc481d (diff) | |
| download | podman-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
| -rw-r--r-- | Makefile | 2 | ||||
| -rwxr-xr-x | contrib/cirrus/integration_test.sh | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -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),) diff --git a/contrib/cirrus/integration_test.sh b/contrib/cirrus/integration_test.sh index 0fd86dfdc..58c8af289 100755 --- a/contrib/cirrus/integration_test.sh +++ b/contrib/cirrus/integration_test.sh @@ -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) ;& |