From 6df249d8d9ce83c0a96ae233989e11e0ce06a452 Mon Sep 17 00:00:00 2001 From: Fatih Degirmenci Date: Wed, 24 Aug 2016 21:41:28 +0200 Subject: fuel: Rearrange slave assignments for verify jobs Change-Id: Iaf83ba8bc96189e9ef7749bd367197857c3e656a Signed-off-by: Fatih Degirmenci --- jjb/fuel/fuel-verify-jobs.yml | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) (limited to 'jjb/fuel/fuel-verify-jobs.yml') diff --git a/jjb/fuel/fuel-verify-jobs.yml b/jjb/fuel/fuel-verify-jobs.yml index 2662cb7c0..f4bdbdd45 100644 --- a/jjb/fuel/fuel-verify-jobs.yml +++ b/jjb/fuel/fuel-verify-jobs.yml @@ -21,13 +21,13 @@ ##################################### phase: - 'basic': - slave-label: 'opnfv-build-ubuntu' + slave-label: 'opnfv-build' - 'build': slave-label: 'opnfv-build-ubuntu' - 'deploy-virtual': - slave-label: 'fuel-virtual' + slave-label: 'opnfv-build' - 'smoke-test': - slave-label: 'fuel-virtual' + slave-label: 'opnfv-build' ##################################### # jobs ##################################### @@ -50,14 +50,7 @@ - throttle: enabled: true max-total: 4 - max-per-node: 1 option: 'project' - - build-blocker: - use-build-blocker: true - blocking-jobs: - - 'fuel-verify-master' - - 'fuel-verify-colorado' - block-level: 'NODE' scm: - gerrit-trigger-scm: @@ -108,7 +101,7 @@ project: '{project}' - gerrit-parameter: branch: '{branch}' - - 'fuel-virtual-defaults' + - 'opnfv-build-defaults' - 'fuel-verify-defaults': gs-pathname: '{gs-pathname}' @@ -154,7 +147,7 @@ GERRIT_REFSPEC=$GERRIT_REFSPEC GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE - node-parameters: true + node-parameters: false kill-phase-on: FAILURE abort-all-job: true - multijob: @@ -168,7 +161,7 @@ GERRIT_REFSPEC=$GERRIT_REFSPEC GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE - node-parameters: true + node-parameters: false kill-phase-on: FAILURE abort-all-job: true -- cgit 1.2.3-korg