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

diff --git a/jjb/global/global-templates-java.yaml b/jjb/global/global-templates-java.yaml
index 639168bc018346bc51dff568f9fb2ec149a12eee..0933bc0cc40ea782799231aaeb584b490a7a7194 100644 (file)
--- 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

diff --git a/jjb/global/global-templates-push-upstream.yaml b/jjb/global/global-templates-push-upstream.yaml
index cde2a836058691698d2132fd02e4df71c999b1f1..7b5612e9cd8eb6cf8a778080be6f4319e09d540c 100644 (file)
--- 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