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 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
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
diff --git a/jjb/global/global-templates-rebase.yaml b/jjb/global/global-templates-rebase.yaml
index 843175e..38712ae 100644
--- 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 3de22ee..cedcea1 100644
--- 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