From e6e6cb384cf3ea0d2d0dcd4994567ecf29bc481d Mon Sep 17 00:00:00 2001
From: Chris Evich <cevich@redhat.com>
Date: Mon, 4 Mar 2019 13:18:10 -0500
Subject: Globally increase test timeout to 90-minutes

Signed-off-by: Chris Evich <cevich@redhat.com>
---
 Makefile                           | 2 +-
 contrib/cirrus/integration_test.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 60fb3eda7..faeeeff07 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),)
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) ;&
-- 
cgit v1.2.3-54-g00ecf