Merge "Add rebase, push jobs for dcaegen2/platform/blueprints"

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

diff --git a/jjb/global/global-templates-rebase.yaml b/jjb/global/global-templates-rebase.yaml
index 843175e60143527c6108c481fdbae5f8ba8fa5fb..38712ae2a87e9a85d4ebb5b0d5b7539c413983ee 100644 (file)
--- a/jjb/global/global-templates-rebase.yaml
+++ b/jjb/global/global-templates-rebase.yaml
@@ -29,6 +29,10 @@
           branch: '{branch}'
           files: '**'
 
+    wrappers:
+      - build-timeout:
+          timeout: 10
+
     builders:
       - shell:
           !include-raw-escape: ./rebase-jobs.sh

diff --git a/jjb/global/jjb-macros.yaml b/jjb/global/jjb-macros.yaml
index 3de22ee034a4ef7edb49b42585d90cb873d03a56..cedcea1b5113f4b43f9c68c15e733387a70ab214 100644 (file)
--- a/jjb/global/jjb-macros.yaml
+++ b/jjb/global/jjb-macros.yaml
@@ -206,3 +206,12 @@
               credential-id: nordixinfra-jjb-creds
               username: JJB_USERNAME
               password: JJB_USERTOKEN
+
+# timeout wrapper to use for jobs
+- wrapper:
+    name: build-timeout
+    wrappers:
+      - timeout:
+          timeout: '{timeout}'
+          timeout-var: 'BUILD_TIMEOUT'
+          fail: true