diff options
| author |   Fatih Degirmenci <fatih.degirmenci@ericsson.com> | 2016-01-22 14:57:24 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-01-22 14:57:24 +0000 |
| commit | db0f468271fa2d15ce094be1852d2311422b772f (patch) | |
| tree | b1301217b18951e0f6230424db62f9401441a06e /jjb | |
| parent | 66e27ff980ecfe541df6b03ee37bb60997279d12 (diff) | |
| parent | 876fa53c6b10a3b73bd70395716a75fd8b53a7c5 (diff) | |
Merge "fuel: Set downstream jobs to run on same slave as parent job"
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/fuel/fuel-ci-jobs.yml | 12 |
1 files changed, 6 insertions, 6 deletions
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' |