diff options
| author | Chris Evich <cevich@redhat.com> | 2019-03-04 13:18:10 -0500 |
|---|---|---|
| committer | Chris Evich <cevich@redhat.com> | 2019-03-04 15:19:15 -0500 |
| commit | e6e6cb384cf3ea0d2d0dcd4994567ecf29bc481d (patch) | |
| tree | f7943594a94c176129df69c804b0debe50e662e3 | |
| parent | 34bf58c5dbb898ef9f813e79b13735eecc933369 (diff) | |
| download | podman-e6e6cb384cf3ea0d2d0dcd4994567ecf29bc481d.tar.gz podman-e6e6cb384cf3ea0d2d0dcd4994567ecf29bc481d.tar.bz2 podman-e6e6cb384cf3ea0d2d0dcd4994567ecf29bc481d.zip | |
Globally increase test timeout to 90-minutes
Signed-off-by: Chris Evich <cevich@redhat.com>
| -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) ;& |