[OOM] Build-timeout for helm verify jobs to 240

The initial commit for this change (66d7747) changed the timeout only
for image-verify jobs, and did so directly in the job template. This
change includes the helm-verify jobs, and sets the timeout in the
calling template.

Change-Id: I80cbe130d3baf0d5671dcc12565e838abf376fe5
Issue-ID: OOM-1
Signed-off-by: Eric Ball <eball@linuxfoundation.org>

diff --git a/jjb/oom/oom-helm.yaml b/jjb/oom/oom-helm.yaml
index 789f7e7..3fb14c9 100644 (file)
--- a/jjb/oom/oom-helm.yaml
+++ b/jjb/oom/oom-helm.yaml
@@ -91,9 +91,11 @@
     jobs:
       - '{project-name}-{stream}-image-verify':
           files: '**'
+          build-timeout: 240
       - '{project-name}-{stream}-verify-helm':
           build_script: '{oom_build_script}'
           files: '**'
+          build-timeout: 240
       - '{project-name}-{stream}-merge-helm':
           build_script: '{oom_build_script}'
           post_build_script: !include-raw-escape: shell/publish_helm_charts.sh

diff --git a/jjb/oom/oom-image-verify.yaml b/jjb/oom/oom-image-verify.yaml
index 2ed313f..8ac6e3a 100644 (file)
--- a/jjb/oom/oom-image-verify.yaml
+++ b/jjb/oom/oom-image-verify.yaml
@@ -11,7 +11,6 @@
     pre_build_script: ''
     submodule-disable: false
     submodule-timeout: 10
-    build-timeout: 240
 
     project-type: freestyle
     node: '{build-node}'