summaryrefslogtreecommitdiff
path: root/contrib/cirrus/integration_test.sh
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-03-05 06:34:03 -0800
committerGitHub <noreply@github.com>2019-03-05 06:34:03 -0800
commit645426fe797f90fc75712388e0373158f13bab0a (patch)
treeb71d724eca80cf4b05d0e5bbc4c13e4b592f5785 /contrib/cirrus/integration_test.sh
parentb62540c6d5a424d3396dd097dd695c3dfb2db6ce (diff)
parente6e6cb384cf3ea0d2d0dcd4994567ecf29bc481d (diff)
downloadpodman-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
Diffstat (limited to 'contrib/cirrus/integration_test.sh')
-rwxr-xr-xcontrib/cirrus/integration_test.sh2
1 files changed, 1 insertions, 1 deletions
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) ;&