summaryrefslogtreecommitdiffstats
path: root/jjb/opnfv
diff options
context:
space:
mode:
authorFatih Degirmenci <fatih.degirmenci@ericsson.com>2016-05-26 00:01:52 +0200
committerFatih Degirmenci <fatih.degirmenci@ericsson.com>2016-05-26 09:33:50 +0200
commit5922d6b54ad1231b1bb5446a72f33a21220d1cbb (patch)
treee90cb003d96b51a462a025880a3167b2ccb574f7 /jjb/opnfv
parent2e2aaccb68c64732c559594b41d587df49cb6130 (diff)
compass: Switch using labels instead of slaves
This change switches compass jobs to use labels instead of tying jobs to slaves. The changes in detail are: - Compass jobs can roam on any pod that is labelled with compass-baremetal and compass-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. - huawei-virtual label is renamed to compass-virtual since we still have installer specific slaves, not company specific. In future the job might end up on a none-Huawei slave too. - huawei-pod2 is not a CI POD so it is left in none-CI PODs section. - block relations and triggers might require fine tuning and left to compass project to decide how to adjust Job structure remains same; one parent job calling 3 downstream jobs: deploy, functest, yardstick. The OS to deploy (trusty or centos7) needs to be solved in a separate patch in a sustainable way. Change-Id: I22bfaff36640667b6764f0e303a3286af0eb41b2 Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
Diffstat (limited to 'jjb/opnfv')
-rw-r--r--jjb/opnfv/slave-params.yml47
1 files changed, 20 insertions, 27 deletions
diff --git a/jjb/opnfv/slave-params.yml b/jjb/opnfv/slave-params.yml
index d89af419a..02d74abff 100644
--- a/jjb/opnfv/slave-params.yml
+++ b/jjb/opnfv/slave-params.yml
@@ -47,6 +47,26 @@
default: https://gerrit.opnfv.org/gerrit/$PROJECT
description: 'Git URL to use on this Jenkins Slave'
- parameter:
+ name: 'compass-baremetal-defaults'
+ parameters:
+ - label:
+ name: SLAVE_LABEL
+ default: 'compass-baremetal'
+ - string:
+ name: GIT_BASE
+ default: https://gerrit.opnfv.org/gerrit/$PROJECT
+ description: 'Git URL to use on this Jenkins Slave'
+- parameter:
+ name: 'compass-virtual-defaults'
+ parameters:
+ - label:
+ name: SLAVE_LABEL
+ default: 'compass-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:
@@ -68,7 +88,6 @@
name: SSH_KEY
default: /root/.ssh/id_rsa
description: 'SSH key to use for Apex'
-
- parameter:
name: 'lf-pod2-defaults'
parameters:
@@ -304,21 +323,6 @@
description: 'Git URL to use on this Jenkins Slave'
- parameter:
- name: 'huawei-virtual-defaults'
- parameters:
- - label:
- name: SLAVE_LABEL
- default: 'huawei-deploy-vm'
- - string:
- name: INSTALLER_VERSION
- default: stable
- 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'
-
-- parameter:
name: 'huawei-pod3-defaults'
parameters:
- node:
@@ -508,17 +512,6 @@
description: 'Git URL to use on this Jenkins Slave'
- parameter:
- name: 'virtual-defaults'
- parameters:
- - label:
- name: SLAVE_LABEL
- default: '{installer}-deploy-virtual'
- - string:
- name: GIT_BASE
- default: https://gerrit.opnfv.org/gerrit/$PROJECT
- description: 'Git URL to use on these Jenkins Slaves'
-
-- parameter:
name: 'ericsson-build-defaults'
parameters:
- label: