commit 8b21bd63ce9937daf8533595bbb84809b41a94b7
author Gareth Roper <Gareth.roper@est.tech> Thu Jan 31 11:56:01 2019 +0000
committer Nordix Gerrit <gerrit@nordix.org> Thu Jan 31 11:56:01 2019 +0000
tree 5030b58f6b3b0a47631a85ff43767f314b30661a
parent d18984c19aaad5f97c01eb06f3e6106f7bb0849e
parent 891d409e74a5b7ac01a103a0469347b8a7f29c72

Merge "Enable 10 minutes build-timeout for rebase jobs"

jjb/global/global-templates-java.yaml

diff --git a/jjb/global/global-templates-java.yaml b/jjb/global/global-templates-java.yaml
index 639168b..0933bc0 100644
--- a/jjb/global/global-templates-java.yaml
+++ b/jjb/global/global-templates-java.yaml
@@ -41,6 +41,10 @@
           branch: '{branch}'
           files: '**'
 
+    wrappers:
+      - build-timeout:
+          timeout: 45
+
     builders:
       - shell:
           !include-raw-escape: ./verify-jobs.sh

jjb/global/global-templates-push-upstream.yaml

diff --git a/jjb/global/global-templates-push-upstream.yaml b/jjb/global/global-templates-push-upstream.yaml
index cde2a83..7b5612e 100644
--- a/jjb/global/global-templates-push-upstream.yaml
+++ b/jjb/global/global-templates-push-upstream.yaml
@@ -25,6 +25,10 @@
           branch: '{branch}'
           files: '**'
 
+    wrappers:
+      - build-timeout:
+          timeout: 10
+
     builders:
       - shell:
           !include-raw-escape: ./push-upstream-jobs.sh