From 75b05731bfcdff6f66d7fb53a8d8f73aeddf21dd Mon Sep 17 00:00:00 2001
From: Khai Do <zaro0508@gmail.com>
Date: Tue, 27 May 2014 13:54:47 -0700
Subject: [PATCH] Add a build-timeout macro

This change adds a build-timeout macro.  This macro sets two parameters
1. sets a 'BUILD_TIMEOUT' environment variable which is set to the
   build timeout value.
2. sets the build to a failed state when a timeout has occurred.

This change requires the Jenkins build-timeout plugin >= ver 1.13
It will not work with older versions of the plugin.  When this parameter
is used with version 1.10 of the plugin Jenkins will set the timeout to 0
and abort builds immediately.

Change-Id: Ie261cac10b59a6094a7f3ec9167274c47b2fc4a3
---
 .../files/jenkins_job_builder/config/defaults.yaml     |  3 +--
 .../files/jenkins_job_builder/config/macros.yaml       | 10 ++++++++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/modules/openstack_project/files/jenkins_job_builder/config/defaults.yaml b/modules/openstack_project/files/jenkins_job_builder/config/defaults.yaml
index f1b48ddd5b..f1edb91667 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/defaults.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/defaults.yaml
@@ -17,9 +17,8 @@
     concurrent: true
 
     wrappers:
-      - timeout:
+      - build-timeout:
           timeout: 30
-          fail: true
       - timestamps
 
     logrotate:
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml b/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml
index d97f282532..441c2fdb05 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml
@@ -295,6 +295,16 @@
 
 # ======================================================================
 
+- wrapper:
+    name: build-timeout
+    wrappers:
+      - timeout:
+          timeout: '{timeout}'
+          timeout-var: 'BUILD_TIMEOUT'
+          fail: true
+
+# ======================================================================
+
 - publisher:
     name: tarball
     publishers: