summaryrefslogtreecommitdiffstats
path: root/jjb/ci-management/ci-management-jobs.yaml
diff options
context:
space:
mode:
authorVanessa Rene Valderrama <vvalderrama@linuxfoundation.org>2018-10-25 16:16:32 -0500
committerVanessa Rene Valderrama <vvalderrama@linuxfoundation.org>2018-10-25 16:16:32 -0500
commit087de93af1cdf0b4a9b53725e196914d28f2431e (patch)
tree5b503752c488e8532479dc772cab74663cfff24f /jjb/ci-management/ci-management-jobs.yaml
parent8601686e5afcb8ceec5fc5621f71e059fa864169 (diff)
Modify merge build-timeout
Upping the build-timeout to resolve build-timeout failures on the merge job. Change-Id: Ia72a07fd4fbda3b08aee52e0a4f5074c72ab26f3 Signed-off-by: Vanessa Rene Valderrama <vvalderrama@linuxfoundation.org>
Diffstat (limited to 'jjb/ci-management/ci-management-jobs.yaml')
-rw-r--r--jjb/ci-management/ci-management-jobs.yaml2
1 files changed, 1 insertions, 1 deletions
diff --git a/jjb/ci-management/ci-management-jobs.yaml b/jjb/ci-management/ci-management-jobs.yaml
index 249b09308..c93871af1 100644
--- a/jjb/ci-management/ci-management-jobs.yaml
+++ b/jjb/ci-management/ci-management-jobs.yaml
@@ -95,7 +95,7 @@
wrappers:
- fdio-infra-wrappers:
- build-timeout: '{build-timeout}'
+ build-timeout: 60
triggers:
- gerrit-trigger-patch-merged: