summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
authorFatih Degirmenci <fatih.degirmenci@ericsson.com>2016-08-24 21:41:28 +0200
committerFatih Degirmenci <fatih.degirmenci@ericsson.com>2016-08-24 21:44:52 +0200
commit6df249d8d9ce83c0a96ae233989e11e0ce06a452 (patch)
tree444698fd08ee15af413586d32e47e96ac49e237b /jjb
parentac0f335a6e62d65865e248a401fa2e184b8df791 (diff)
fuel: Rearrange slave assignments for verify jobs
Change-Id: Iaf83ba8bc96189e9ef7749bd367197857c3e656a Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
Diffstat (limited to 'jjb')
-rw-r--r--jjb/fuel/fuel-verify-jobs.yml19
-rw-r--r--jjb/opnfv/slave-params.yml15
2 files changed, 21 insertions, 13 deletions
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
diff --git a/jjb/opnfv/slave-params.yml b/jjb/opnfv/slave-params.yml
index 019148a96..562a9dae9 100644
--- a/jjb/opnfv/slave-params.yml
+++ b/jjb/opnfv/slave-params.yml
@@ -254,6 +254,21 @@
default: $WORKSPACE/build_output
description: "Directory where the build artifact will be located upon the completion of the build."
- parameter:
+ name: 'opnfv-build-defaults'
+ parameters:
+ - label:
+ name: SLAVE_LABEL
+ default: 'opnfv-build'
+ description: 'Slave label on Jenkins'
+ - string:
+ name: GIT_BASE
+ default: https://gerrit.opnfv.org/gerrit/$PROJECT
+ description: 'Git URL to use on this Jenkins Slave'
+ - string:
+ name: BUILD_DIRECTORY
+ default: $WORKSPACE/build_output
+ description: "Directory where the build artifact will be located upon the completion of the build."
+- parameter:
name: 'huawei-build-defaults'
parameters:
- node: