diff options
author | Fatih Degirmenci <fatih.degirmenci@ericsson.com> | 2016-05-25 22:28:20 +0200 |
---|---|---|
committer | Fatih Degirmenci <fatih.degirmenci@ericsson.com> | 2016-05-26 06:55:44 +0000 |
commit | 2e2aaccb68c64732c559594b41d587df49cb6130 (patch) | |
tree | ba74119ac712a2705b1a5958dff248e3f5831a73 /jjb/opnfv | |
parent | 2377f84d9142dad19bfabc795d3a5a73e3c67533 (diff) |
joid: Switch using labels instead of slaves
This change switches joid jobs to use labels instead of tying
jobs to slaves.
The changes in detail are:
- Joid jobs can roam on any pod that is labelled with joid-baremetal
and joid-virtual.
- Above means that there is no branch/pod allocation anymore.
- New jobs are created in order to get rid of pod names from them and
just use baremetal or virtual in names.
- Old jobs are removed.
- Related test jobs are updated.
- POD specific parameters are updated and instead of adding pod
specific parameters, they now become parameters for all the pods
labelled with same label. It is not a problem at the moment as
both Intel PODs (pod5, pod6) have same parameters but a different
pod with different parameters will require alignment between pods.
Job structure remains same; one parent job calling 3 downstream jobs:
deploy, functest, yardstick.
Change-Id: I30d270cd05ba3756f6f161d65ee5160eab6b80f4
Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
Diffstat (limited to 'jjb/opnfv')
-rw-r--r-- | jjb/opnfv/slave-params.yml | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/jjb/opnfv/slave-params.yml b/jjb/opnfv/slave-params.yml index ddeeaab09..d89af419a 100644 --- a/jjb/opnfv/slave-params.yml +++ b/jjb/opnfv/slave-params.yml @@ -19,6 +19,34 @@ default: https://gerrit.opnfv.org/gerrit/$PROJECT description: 'Git URL to use on this Jenkins Slave' - parameter: + name: 'joid-baremetal-defaults' + parameters: + - label: + name: SLAVE_LABEL + default: 'joid-baremetal' + - string: + name: GIT_BASE + default: https://gerrit.opnfv.org/gerrit/$PROJECT + description: 'Git URL to use on this Jenkins Slave' + - string: + name: CEPH_DISKS + default: /srv + description: "Disks to use by ceph (comma separated list)" + - string: + name: EXTERNAL_NETWORK + default: ext-net;flat;10.5.15.5;10.5.15.250;10.5.15.254;10.5.15.0/24 + description: "External network to create for pod5 (name;type;first ip;last ip; gateway;network)" +- parameter: + name: 'joid-virtual-defaults' + parameters: + - label: + name: SLAVE_LABEL + default: 'joid-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: |