summaryrefslogtreecommitdiffstats
path: root/jjb/opnfv
diff options
context:
space:
mode:
authorFatih Degirmenci <fatih.degirmenci@ericsson.com>2016-05-24 21:24:30 +0200
committerFatih Degirmenci <fatih.degirmenci@ericsson.com>2016-05-25 21:15:46 +0200
commitce4601a1ddc92b32afeef181644fdab09287d948 (patch)
tree6afd3f8c6c8f23e17a69d1ef319c437da6ac5c36 /jjb/opnfv
parent27b0a60dc802a6834bc9b2b51274d4016a4b0b7f (diff)
fuel: Switch using labels instead of slaves
This change switches fuel jobs to use labels instead of tying jobs to slaves. The possibilities and changes introduced with this approach are - If things do not work as expected, slave-label parameter can be set to certain slave name to get back to old way of tying jobs to slaves. - If a scenario requires a different slave, it can still be created using baremetal or virtual but the label can be different, pointing to a slave that is capable of running that scenario. (fuel-baremetal-multisite, etc.) - The auto-trigger-name for brahmaputra is moved under the branch anchor and can be used like this if triggers for all all the jobs for a certain branch need not to be triggered automatically but job is still kept enabled in case if some crucial bug needs to be tested. - No of max concurrent builds stepped to 4 in order to use all the labelled slaves available. This will require some adjustments before colorado jobs start to run in order to share resources between branches fairly. - All the fuel CI PODs except lf-pod1 have been removed. Change-Id: I91eca6743bb3d34263e634f9b74550efa1e2ddbe Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
Diffstat (limited to 'jjb/opnfv')
-rw-r--r--jjb/opnfv/slave-params.yml38
1 files changed, 20 insertions, 18 deletions
diff --git a/jjb/opnfv/slave-params.yml b/jjb/opnfv/slave-params.yml
index 7216f7cbc..ddeeaab09 100644
--- a/jjb/opnfv/slave-params.yml
+++ b/jjb/opnfv/slave-params.yml
@@ -1,4 +1,24 @@
- parameter:
+ name: 'fuel-baremetal-defaults'
+ parameters:
+ - label:
+ name: SLAVE_LABEL
+ default: 'fuel-baremetal'
+ - string:
+ name: GIT_BASE
+ default: https://gerrit.opnfv.org/gerrit/$PROJECT
+ description: 'Git URL to use on this Jenkins Slave'
+- parameter:
+ name: 'fuel-virtual-defaults'
+ parameters:
+ - label:
+ name: SLAVE_LABEL
+ default: 'fuel-virtual'
+ - string:
+ name: GIT_BASE
+ default: https://gerrit.opnfv.org/gerrit/$PROJECT
+ description: 'Git URL to use on this Jenkins Slave'
+- parameter:
name: 'lf-pod1-defaults'
parameters:
- node:
@@ -32,14 +52,9 @@
default-slaves:
- lf-pod2
- string:
- name: INSTALLER_VERSION
- default: stable
- description: 'Version of the installer to deploy'
- - string:
name: GIT_BASE
default: ssh://gerrit.opnfv.org:29418/$PROJECT
description: 'Git URL to use on this Jenkins Slave'
-
- parameter:
name: 'ericsson-pod1-defaults'
parameters:
@@ -51,18 +66,9 @@
default-slaves:
- ericsson-pod1
- string:
- name: INSTALLER_VERSION
- default: latest
- description: 'Version of the installer to deploy'
- - string:
name: GIT_BASE
default: https://gerrit.opnfv.org/gerrit/$PROJECT
description: 'Git URL to use on this Jenkins Slave'
- - string:
- name: POD_CONF_DIR
- default: $WORKSPACE/deploy/templates/hardware_environment/conf/ericsson_montreal_lab/pod1
- description: 'Directory where POD configuration files are located.'
-
- parameter:
name: 'ericsson-pod2-defaults'
parameters:
@@ -74,10 +80,6 @@
default-slaves:
- ericsson-pod2
- string:
- name: INSTALLER_VERSION
- default: latest
- description: 'Version of the installer to deploy'
- - string:
name: GIT_BASE
default: https://gerrit.opnfv.org/gerrit/$PROJECT
description: 'Git URL to use on this Jenkins Slave'