From: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
Date: Fri, 22 Jan 2016 13:41:31 +0000 (+0100)
Subject: fuel: Set downstream jobs to run on same slave as parent job
X-Git-Tag: brahmaputra.1.0~145^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=876fa53c6b10a3b73bd70395716a75fd8b53a7c5;p=releng.git

fuel: Set downstream jobs to run on same slave as parent job

Change-Id: I27d6c4ac0a1584fe31929738fd155a1236717593
Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
---

diff --git a/jjb/fuel/fuel-ci-jobs.yml b/jjb/fuel/fuel-ci-jobs.yml
index 7652927e1..0fb5c7c36 100644
--- a/jjb/fuel/fuel-ci-jobs.yml
+++ b/jjb/fuel/fuel-ci-jobs.yml
@@ -88,8 +88,6 @@
 - job-template:
     name: 'fuel-{scenario}-{pod}-daily-{stream}'
 
-    node: intel-build
-
     concurrent: false
 
     properties:
@@ -113,6 +111,8 @@
         - project-parameter:
             project: '{project}'
         - '{installer}-defaults'
+        - '{pod}-defaults':
+            installer: '{installer}'
         - string:
             name: DEPLOY_SCENARIO
             default: '{scenario}'
@@ -125,14 +125,14 @@
               current-parameters: false
               predefined-parameters:
                 DEPLOY_SCENARIO={scenario}
-              node-parameters: true
+              same-node: true
               block: true
         - trigger-builds:
             - project: 'functest-fuel-{pod}-daily-{stream}'
               current-parameters: false
               predefined-parameters:
                 DEPLOY_SCENARIO={scenario}
-              node-parameters: true
+              same-node: true
               block: true
               block-thresholds:
                 build-step-failure-threshold: 'never'
@@ -144,7 +144,7 @@
               predefined-parameters:
                 DEPLOY_SCENARIO={scenario}
               block: true
-              node-parameters: true
+              same-node: true
               block-thresholds:
                 build-step-failure-threshold: 'never'
                 failure-threshold: 'never'
@@ -168,9 +168,9 @@
     parameters:
         - project-parameter:
             project: '{project}'
+        - '{installer}-defaults'
         - '{pod}-defaults':
             installer: '{installer}'
-        - '{installer}-defaults'
         - string:
             name: DEPLOY_SCENARIO
             default: 'os-odl_l2-nofeature-ha'