From 54d47b14cd435df3c22d769c398bbefd1dc3fb70 Mon Sep 17 00:00:00 2001
From: iberezovskiy <iberezovskiy@mirantis.com>
Date: Fri, 20 Jun 2014 12:57:18 +0400
Subject: [PATCH] Add value 'global' for defaults in jobs

Parameter 'defaults' shouldn't be empty.
It's required by jenkins job builder.
Increase timeout for global defaults.

Change-Id: If9e14c9123a7644921f89f2c93220994f8382252
---
 jenkins_job_builder/defaults.yaml  | 2 +-
 jenkins_job_builder/diskimage.yaml | 4 ++--
 jenkins_job_builder/sahara-ui.yaml | 2 +-
 jenkins_job_builder/sahara.yaml    | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/jenkins_job_builder/defaults.yaml b/jenkins_job_builder/defaults.yaml
index 31b606de..e35fac2c 100644
--- a/jenkins_job_builder/defaults.yaml
+++ b/jenkins_job_builder/defaults.yaml
@@ -17,7 +17,7 @@
 
     wrappers:
       - timeout:
-          timeout: 30
+          timeout: 120
           fail: true
       - timestamps
 
diff --git a/jenkins_job_builder/diskimage.yaml b/jenkins_job_builder/diskimage.yaml
index ab147102..2e2c7464 100644
--- a/jenkins_job_builder/diskimage.yaml
+++ b/jenkins_job_builder/diskimage.yaml
@@ -1,6 +1,6 @@
 - job-template:
     name: 'diskimage-integration-{plugin}'
-    defaults:
+    defaults: global
     concurrent: false
     builders:
       - gerrit-git-prep
@@ -22,7 +22,7 @@
 
 - job-template:
     name: 'diskimage-integration-vanilla-{image}'
-    defaults:
+    defaults: global
     concurrent: false
     builders:
       - gerrit-git-prep
diff --git a/jenkins_job_builder/sahara-ui.yaml b/jenkins_job_builder/sahara-ui.yaml
index c2e86689..1faa61b0 100644
--- a/jenkins_job_builder/sahara-ui.yaml
+++ b/jenkins_job_builder/sahara-ui.yaml
@@ -1,7 +1,7 @@
 - job:
     name: gate-ui-tests
     project-type: freestyle
-    defaults:
+    defaults: global
     description: "<b>This job is managed by Jenkins Job Builder, do not edit it through WebUI.\
                   \n<p>Please use this repository to make changes: <a href=\"https://github.com/stackforge/sahara-ci-config\">https://github.com/stackforge/sahara-ci-config</a></b>\
                   \n<p><b>Title</b>: Tests for savanna dashboard<br/>\
diff --git a/jenkins_job_builder/sahara.yaml b/jenkins_job_builder/sahara.yaml
index e4e20a56..2180faaa 100644
--- a/jenkins_job_builder/sahara.yaml
+++ b/jenkins_job_builder/sahara.yaml
@@ -1,6 +1,6 @@
 - job-template:
     name: 'gate-saharaclient-integration-{plugin}'
-    defaults:
+    defaults: global
     concurrent: true
     builders:
       - gerrit-git-prep
@@ -25,7 +25,7 @@
 
 - job-template:
     name: 'gate-sahara-integration-{plugin}'
-    defaults:
+    defaults: global
     concurrent: true
     builders:
       - gerrit-git-prep