summaryrefslogtreecommitdiffstats
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
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>
-rw-r--r--jjb/fuel/fuel-ci-jobs.yml360
-rw-r--r--[-rwxr-xr-x]jjb/fuel/fuel-project-jobs.yml2
-rw-r--r--jjb/functest/functest-ci-jobs.yml111
-rw-r--r--jjb/opnfv/slave-params.yml38
-rw-r--r--jjb/releng-macros.yaml5
-rw-r--r--jjb/yardstick/yardstick-ci-jobs.yml169
6 files changed, 247 insertions, 438 deletions
diff --git a/jjb/fuel/fuel-ci-jobs.yml b/jjb/fuel/fuel-ci-jobs.yml
index f6c21e72e..5d2b91db8 100644
--- a/jjb/fuel/fuel-ci-jobs.yml
+++ b/jjb/fuel/fuel-ci-jobs.yml
@@ -18,32 +18,35 @@
stream: brahmaputra
branch: 'stable/{stream}'
gs-pathname: '/{stream}'
+ auto-trigger-name: 'daily-trigger-disabled'
#--------------------------------
# POD, INSTALLER, AND BRANCH MAPPING
#--------------------------------
-# brahmaputra
+# CI PODs
#--------------------------------
pod:
- - lf-pod2:
- <<: *brahmaputra
- - ericsson-pod1:
- <<: *brahmaputra
- - ericsson-pod2:
+ - baremetal:
+ slave-label: fuel-baremetal
+ <<: *master
+ - virtual:
+ slave-label: fuel-virtual
+ <<: *master
+ - baremetal:
+ slave-label: fuel-baremetal
<<: *brahmaputra
- virtual:
+ slave-label: fuel-virtual
<<: *brahmaputra
-#--------------------------------
-# master
-#--------------------------------
+
+# just in case if things go wrong
- lf-pod2:
+ slave-label: '{pod}'
<<: *master
- - ericsson-pod1:
- <<: *master
- - ericsson-pod2:
- <<: *master
- - virtual:
- <<: *master
+#--------------------------------
+# None-CI PODs
+#--------------------------------
- zte-pod1:
+ slave-label: zte-pod1
<<: *master
#--------------------------------
# scenarios
@@ -51,44 +54,23 @@
scenario:
# HA scenarios
- 'os-nosdn-nofeature-ha':
- auto-trigger-name: 'fuel-{scenario}-{pod}-{stream}-trigger'
+ auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
- 'os-odl_l2-nofeature-ha':
- auto-trigger-name: 'fuel-{scenario}-{pod}-{stream}-trigger'
+ auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
- 'os-odl_l3-nofeature-ha':
- auto-trigger-name: 'fuel-{scenario}-{pod}-{stream}-trigger'
+ auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
- 'os-onos-nofeature-ha':
- auto-trigger-name: 'fuel-{scenario}-{pod}-{stream}-trigger'
+ auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
- 'os-odl_l2-bgpvpn-ha':
- auto-trigger-name: 'fuel-{scenario}-{pod}-{stream}-trigger'
+ auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
- 'os-odl_l2-sfc-ha':
- auto-trigger-name: 'fuel-{scenario}-{pod}-{stream}-trigger'
+ auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
- 'os-nosdn-kvm-ha':
- auto-trigger-name: 'fuel-{scenario}-{pod}-{stream}-trigger'
+ auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
- 'os-nosdn-ovs-ha':
- auto-trigger-name: 'fuel-{scenario}-{pod}-{stream}-trigger'
+ auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
- 'os-nosdn-kvm_ovs-ha':
- auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
- - 'os-nosdn-vlan-ha':
- auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
- # NOHA scenarios
- - 'os-odl_l2-nofeature-noha':
- auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
- - 'os-odl_l3-nofeature-noha':
- auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
- - 'os-onos-nofeature-noha':
- auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
- - 'os-nosdn-nofeature-noha':
- auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
- - 'os-nosdn-kvm-noha':
- auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
- - 'os-nosdn-kvm_ovs-noha':
- auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
- - 'os-nosdn-ovs-noha':
- auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
- - 'os-odl_l2-bgpvpn-noha':
- auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
- - 'os-odl_l2-sfc-noha':
- auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
+ auto-trigger-name: 'daily-trigger-disabled'
jobs:
- 'fuel-{scenario}-{pod}-daily-{stream}'
@@ -105,7 +87,7 @@
properties:
- throttle:
enabled: true
- max-total: 1
+ max-total: 4
max-per-node: 1
- build-blocker:
use-build-blocker: true
@@ -124,7 +106,7 @@
- project-parameter:
project: '{project}'
- '{installer}-defaults'
- - '{pod}-defaults':
+ - '{slave-label}-defaults':
installer: '{installer}'
- string:
name: DEPLOY_SCENARIO
@@ -184,7 +166,7 @@
- project-parameter:
project: '{project}'
- '{installer}-defaults'
- - '{pod}-defaults':
+ - '{slave-label}-defaults':
installer: '{installer}'
- string:
name: DEPLOY_SCENARIO
@@ -236,352 +218,154 @@
# os-nosdn-nofeature-ha trigger
# CI PODs
#-----------------------------------------------
-# LF POD2 Triggers running against master branch
+# Triggers for job running on fuel-baremetal against master branch
#-----------------------------------------------
- trigger:
- name: 'fuel-os-nosdn-nofeature-ha-lf-pod2-master-trigger'
+ name: 'fuel-os-nosdn-nofeature-ha-baremetal-daily-master-trigger'
triggers:
- timed: '0 0 * * *'
- trigger:
- name: 'fuel-os-odl_l2-nofeature-ha-lf-pod2-master-trigger'
+ name: 'fuel-os-odl_l2-nofeature-ha-baremetal-daily-master-trigger'
triggers:
- timed: '0 3 * * *'
- trigger:
- name: 'fuel-os-odl_l3-nofeature-ha-lf-pod2-master-trigger'
+ name: 'fuel-os-odl_l3-nofeature-ha-baremetal-daily-master-trigger'
triggers:
- timed: '0 6 * * *'
- trigger:
- name: 'fuel-os-onos-nofeature-ha-lf-pod2-master-trigger'
+ name: 'fuel-os-onos-nofeature-ha-baremetal-daily-master-trigger'
triggers:
- timed: '0 9 * * *'
- trigger:
- name: 'fuel-os-odl_l2-bgpvpn-ha-lf-pod2-master-trigger'
+ name: 'fuel-os-odl_l2-bgpvpn-ha-baremetal-daily-master-trigger'
triggers:
- timed: '0 12 * * *'
- trigger:
- name: 'fuel-os-odl_l2-sfc-ha-lf-pod2-master-trigger'
+ name: 'fuel-os-odl_l2-sfc-ha-baremetal-daily-master-trigger'
triggers:
- timed: '0 15 * * *'
- trigger:
- name: 'fuel-os-nosdn-kvm-ha-lf-pod2-master-trigger'
+ name: 'fuel-os-nosdn-kvm-ha-baremetal-daily-master-trigger'
triggers:
- timed: '0 18 * * *'
- trigger:
- name: 'fuel-os-nosdn-ovs-ha-lf-pod2-master-trigger'
+ name: 'fuel-os-nosdn-ovs-ha-baremetal-daily-master-trigger'
triggers:
- timed: '0 21 * * *'
- trigger:
- name: 'fuel-os-nosdn-kvm-noha-lf-pod2-master-trigger'
+ name: 'fuel-os-nosdn-kvm-noha-baremetal-daily-master-trigger'
triggers:
- timed: ''
#-----------------------------------------------
-# Ericsson POD2 Triggers running against brahmaputra branch
+# Triggers for job running on lf-pod2 against master branch
#-----------------------------------------------
- trigger:
- name: 'fuel-os-nosdn-nofeature-ha-ericsson-pod2-brahmaputra-trigger'
+ name: 'fuel-os-nosdn-nofeature-ha-lf-pod2-daily-master-trigger'
triggers:
- timed: ''
- trigger:
- name: 'fuel-os-odl_l2-nofeature-ha-ericsson-pod2-brahmaputra-trigger'
+ name: 'fuel-os-odl_l2-nofeature-ha-lf-pod2-daily-master-trigger'
triggers:
- timed: ''
- trigger:
- name: 'fuel-os-odl_l3-nofeature-ha-ericsson-pod2-brahmaputra-trigger'
+ name: 'fuel-os-odl_l3-nofeature-ha-lf-pod2-daily-master-trigger'
triggers:
- timed: ''
- trigger:
- name: 'fuel-os-onos-nofeature-ha-ericsson-pod2-brahmaputra-trigger'
+ name: 'fuel-os-onos-nofeature-ha-lf-pod2-daily-master-trigger'
triggers:
- timed: ''
- trigger:
- name: 'fuel-os-odl_l2-bgpvpn-ha-ericsson-pod2-brahmaputra-trigger'
+ name: 'fuel-os-odl_l2-bgpvpn-ha-lf-pod2-daily-master-trigger'
triggers:
- timed: ''
- trigger:
- name: 'fuel-os-odl_l2-sfc-ha-ericsson-pod2-brahmaputra-trigger'
+ name: 'fuel-os-odl_l2-sfc-ha-lf-pod2-daily-master-trigger'
triggers:
- timed: ''
- trigger:
- name: 'fuel-os-nosdn-kvm-ha-ericsson-pod2-brahmaputra-trigger'
+ name: 'fuel-os-nosdn-kvm-ha-lf-pod2-daily-master-trigger'
triggers:
- timed: ''
- trigger:
- name: 'fuel-os-nosdn-ovs-ha-ericsson-pod2-brahmaputra-trigger'
+ name: 'fuel-os-nosdn-ovs-ha-lf-pod2-daily-master-trigger'
triggers:
- timed: ''
- trigger:
- name: 'fuel-os-nosdn-kvm-noha-ericsson-pod2-brahmaputra-trigger'
+ name: 'fuel-os-nosdn-kvm-noha-lf-pod2-daily-master-trigger'
triggers:
- timed: ''
-
#-----------------------------------------------
-# ZTE POD1 Triggers running against master branch
+# Triggers for job running on fuel-virtual against master branch
#-----------------------------------------------
- trigger:
- name: 'fuel-os-nosdn-nofeature-ha-zte-pod1-master-trigger'
+ name: 'fuel-os-nosdn-nofeature-ha-virtual-daily-master-trigger'
triggers:
- timed: ''
- trigger:
- name: 'fuel-os-odl_l2-nofeature-ha-zte-pod1-master-trigger'
- triggers:
- - timed: '0 12 * * *'
-- trigger:
- name: 'fuel-os-odl_l3-nofeature-ha-zte-pod1-master-trigger'
+ name: 'fuel-os-odl_l2-nofeature-ha-virtual-daily-master-trigger'
triggers:
- timed: ''
- trigger:
- name: 'fuel-os-onos-nofeature-ha-zte-pod1-master-trigger'
+ name: 'fuel-os-odl_l3-nofeature-ha-virtual-daily-master-trigger'
triggers:
- timed: ''
- trigger:
- name: 'fuel-os-odl_l2-bgpvpn-ha-zte-pod1-master-trigger'
+ name: 'fuel-os-onos-nofeature-ha-virtual-daily-master-trigger'
triggers:
- timed: ''
- trigger:
- name: 'fuel-os-odl_l2-sfc-ha-zte-pod1-master-trigger'
+ name: 'fuel-os-odl_l2-bgpvpn-ha-virtual-daily-master-trigger'
triggers:
- timed: ''
- trigger:
- name: 'fuel-os-nosdn-kvm-ha-zte-pod1-master-trigger'
+ name: 'fuel-os-odl_l2-sfc-ha-virtual-daily-master-trigger'
triggers:
- timed: ''
- trigger:
- name: 'fuel-os-nosdn-ovs-ha-zte-pod1-master-trigger'
- triggers:
- - timed: ''
-#-----------------------------------------------
-# Triggers for other PODs
-#-----------------------------------------------
-- trigger:
- name: 'fuel-os-nosdn-nofeature-ha-ericsson-pod1-master-trigger'
+ name: 'fuel-os-nosdn-kvm-ha-virtual-daily-master-trigger'
triggers:
- timed: ''
- trigger:
- name: 'fuel-os-nosdn-nofeature-ha-ericsson-pod2-master-trigger'
+ name: 'fuel-os-nosdn-ovs-ha-virtual-daily-master-trigger'
triggers:
- timed: ''
- trigger:
- name: 'fuel-os-nosdn-nofeature-ha-virtual-master-trigger'
- triggers:
- - timed: ''
-- trigger:
- name: 'fuel-os-nosdn-nofeature-ha-lf-pod2-brahmaputra-trigger'
- triggers:
- - timed: ''
-- trigger:
- name: 'fuel-os-nosdn-nofeature-ha-ericsson-pod1-brahmaputra-trigger'
- triggers:
- - timed: ''
-- trigger:
- name: 'fuel-os-nosdn-nofeature-ha-virtual-brahmaputra-trigger'
- triggers:
- - timed: ''
-
-# os-nosdn-kvm-ha trigger
-- trigger:
- name: 'fuel-os-nosdn-kvm-ha-ericsson-pod1-master-trigger'
- triggers:
- - timed: ''
-- trigger:
- name: 'fuel-os-nosdn-kvm-ha-ericsson-pod2-master-trigger'
- triggers:
- - timed: ''
-- trigger:
- name: 'fuel-os-nosdn-kvm-ha-virtual-master-trigger'
- triggers:
- - timed: ''
-- trigger:
- name: 'fuel-os-nosdn-kvm-ha-lf-pod2-brahmaputra-trigger'
- triggers:
- - timed: ''
-- trigger:
- name: 'fuel-os-nosdn-kvm-ha-ericsson-pod1-brahmaputra-trigger'
- triggers:
- - timed: ''
-- trigger:
- name: 'fuel-os-nosdn-kvm-ha-virtual-brahmaputra-trigger'
- triggers:
- - timed: ''
-
-# os-odl_l2-nofeature-ha trigger
-- trigger:
- name: 'fuel-os-odl_l2-nofeature-ha-ericsson-pod1-master-trigger'
- triggers:
- - timed: ''
-- trigger:
- name: 'fuel-os-odl_l2-nofeature-ha-ericsson-pod2-master-trigger'
- triggers:
- - timed: ''
-- trigger:
- name: 'fuel-os-odl_l2-nofeature-ha-virtual-master-trigger'
- triggers:
- - timed: ''
-- trigger:
- name: 'fuel-os-odl_l2-nofeature-ha-lf-pod2-brahmaputra-trigger'
- triggers:
- - timed: ''
-- trigger:
- name: 'fuel-os-odl_l2-nofeature-ha-ericsson-pod1-brahmaputra-trigger'
- triggers:
- - timed: ''
-- trigger:
- name: 'fuel-os-odl_l2-nofeature-ha-virtual-brahmaputra-trigger'
- triggers:
- - timed: ''
-
-# os-odl_l3-nofeature-ha trigger
-- trigger:
- name: 'fuel-os-odl_l3-nofeature-ha-ericsson-pod1-master-trigger'
- triggers:
- - timed: ''
-- trigger:
- name: 'fuel-os-odl_l3-nofeature-ha-ericsson-pod2-master-trigger'
- triggers:
- - timed: ''
-- trigger:
- name: 'fuel-os-odl_l3-nofeature-ha-virtual-master-trigger'
- triggers:
- - timed: ''
-- trigger:
- name: 'fuel-os-odl_l3-nofeature-ha-lf-pod2-brahmaputra-trigger'
- triggers:
- - timed: ''
-- trigger:
- name: 'fuel-os-odl_l3-nofeature-ha-ericsson-pod1-brahmaputra-trigger'
- triggers:
- - timed: ''
-- trigger:
- name: 'fuel-os-odl_l3-nofeature-ha-virtual-brahmaputra-trigger'
- triggers:
- - timed: ''
-
-# os-onos-nofeature-ha trigger
-- trigger:
- name: 'fuel-os-onos-nofeature-ha-ericsson-pod1-master-trigger'
- triggers:
- - timed: ''
-- trigger:
- name: 'fuel-os-onos-nofeature-ha-ericsson-pod2-master-trigger'
- triggers:
- - timed: ''
-- trigger:
- name: 'fuel-os-onos-nofeature-ha-virtual-master-trigger'
- triggers:
- - timed: ''
-- trigger:
- name: 'fuel-os-onos-nofeature-ha-lf-pod2-brahmaputra-trigger'
- triggers:
- - timed: ''
-- trigger:
- name: 'fuel-os-onos-nofeature-ha-ericsson-pod1-brahmaputra-trigger'
- triggers:
- - timed: ''
-- trigger:
- name: 'fuel-os-onos-nofeature-ha-virtual-brahmaputra-trigger'
- triggers:
- - timed: ''
-
-
-# os-nosdn-ovs-ha trigger
-- trigger:
- name: 'fuel-os-nosdn-ovs-ha-ericsson-pod1-master-trigger'
- triggers:
- - timed: ''
-- trigger:
- name: 'fuel-os-nosdn-ovs-ha-ericsson-pod2-master-trigger'
- triggers:
- - timed: ''
-- trigger:
- name: 'fuel-os-nosdn-ovs-ha-virtual-master-trigger'
- triggers:
- - timed: ''
-- trigger:
- name: 'fuel-os-nosdn-ovs-ha-lf-pod2-brahmaputra-trigger'
- triggers:
- - timed: ''
-- trigger:
- name: 'fuel-os-nosdn-ovs-ha-ericsson-pod1-brahmaputra-trigger'
- triggers:
- - timed: ''
-- trigger:
- name: 'fuel-os-nosdn-ovs-ha-virtual-brahmaputra-trigger'
- triggers:
- - timed: ''
-
-# os-odl_l2-bgpvpn-ha trigger
-- trigger:
- name: 'fuel-os-odl_l2-bgpvpn-ha-ericsson-pod1-master-trigger'
- triggers:
- - timed: ''
-- trigger:
- name: 'fuel-os-odl_l2-bgpvpn-ha-ericsson-pod2-master-trigger'
- triggers:
- - timed: ''
-- trigger:
- name: 'fuel-os-odl_l2-bgpvpn-ha-virtual-master-trigger'
- triggers:
- - timed: ''
-- trigger:
- name: 'fuel-os-odl_l2-bgpvpn-ha-lf-pod2-brahmaputra-trigger'
- triggers:
- - timed: ''
-- trigger:
- name: 'fuel-os-odl_l2-bgpvpn-ha-ericsson-pod1-brahmaputra-trigger'
- triggers:
- - timed: ''
-- trigger:
- name: 'fuel-os-odl_l2-bgpvpn-ha-virtual-brahmaputra-trigger'
- triggers:
- - timed: ''
-
-# os-odl_l2-sfc-ha trigger
-- trigger:
- name: 'fuel-os-odl_l2-sfc-ha-ericsson-pod1-master-trigger'
- triggers:
- - timed: ''
-- trigger:
- name: 'fuel-os-odl_l2-sfc-ha-ericsson-pod2-master-trigger'
- triggers:
- - timed: ''
-- trigger:
- name: 'fuel-os-odl_l2-sfc-ha-virtual-master-trigger'
- triggers:
- - timed: ''
-- trigger:
- name: 'fuel-os-odl_l2-sfc-ha-lf-pod2-brahmaputra-trigger'
+ name: 'fuel-os-nosdn-kvm-noha-virtual-daily-master-trigger'
triggers:
- timed: ''
+#-----------------------------------------------
+# ZTE POD1 Triggers running against master branch
+#-----------------------------------------------
- trigger:
- name: 'fuel-os-odl_l2-sfc-ha-ericsson-pod1-brahmaputra-trigger'
+ name: 'fuel-os-nosdn-nofeature-ha-zte-pod1-daily-master-trigger'
triggers:
- timed: ''
- trigger:
- name: 'fuel-os-odl_l2-sfc-ha-virtual-brahmaputra-trigger'
+ name: 'fuel-os-odl_l2-nofeature-ha-zte-pod1-daily-master-trigger'
triggers:
- - timed: ''
-
-# os-nosdn-kvm-ha trigger
+ - timed: '0 12 * * *'
- trigger:
- name: 'fuel-os-nosdn-kvm-noha-ericsson-pod1-master-trigger'
+ name: 'fuel-os-odl_l3-nofeature-ha-zte-pod1-daily-master-trigger'
triggers:
- timed: ''
- trigger:
- name: 'fuel-os-nosdn-kvm-noha-ericsson-pod2-master-trigger'
+ name: 'fuel-os-onos-nofeature-ha-zte-pod1-daily-master-trigger'
triggers:
- timed: ''
- trigger:
- name: 'fuel-os-nosdn-kvm-noha-virtual-master-trigger'
+ name: 'fuel-os-odl_l2-bgpvpn-ha-zte-pod1-daily-master-trigger'
triggers:
- timed: ''
- trigger:
- name: 'fuel-os-nosdn-kvm-noha-lf-pod2-brahmaputra-trigger'
+ name: 'fuel-os-odl_l2-sfc-ha-zte-pod1-daily-master-trigger'
triggers:
- timed: ''
- trigger:
- name: 'fuel-os-nosdn-kvm-noha-ericsson-pod1-brahmaputra-trigger'
+ name: 'fuel-os-nosdn-kvm-ha-zte-pod1-daily-master-trigger'
triggers:
- timed: ''
- trigger:
- name: 'fuel-os-nosdn-kvm-noha-virtual-brahmaputra-trigger'
+ name: 'fuel-os-nosdn-ovs-ha-zte-pod1-daily-master-trigger'
triggers:
- timed: ''
diff --git a/jjb/fuel/fuel-project-jobs.yml b/jjb/fuel/fuel-project-jobs.yml
index eee588d24..4e59c01d8 100755..100644
--- a/jjb/fuel/fuel-project-jobs.yml
+++ b/jjb/fuel/fuel-project-jobs.yml
@@ -232,7 +232,7 @@
project: '{project}'
- gerrit-parameter:
branch: '{branch}'
- - 'virtual-defaults':
+ - 'fuel-virtual-defaults':
installer: '{installer}'
- '{installer}-defaults'
- fuel-project-parameter:
diff --git a/jjb/functest/functest-ci-jobs.yml b/jjb/functest/functest-ci-jobs.yml
index 5db40a3d7..1ccaa1b10 100644
--- a/jjb/functest/functest-ci-jobs.yml
+++ b/jjb/functest/functest-ci-jobs.yml
@@ -22,90 +22,119 @@
#--------------------------------
# POD, INSTALLER, AND BRANCH MAPPING
#--------------------------------
-# brahmaputra
+# Installers using labels
+# CI PODs
+# This section should only contain the installers
+# that have been switched using labels for slaves
#--------------------------------
pod:
- - lf-pod1:
- installer: apex
- <<: *brahmaputra
- - intel-pod5:
- installer: joid
- <<: *brahmaputra
- - orange-pod2:
- installer: joid
- <<: *brahmaputra
- - huawei-pod1:
- installer: compass
- <<: *brahmaputra
- - ericsson-pod1:
- installer: fuel
- <<: *brahmaputra
- - ericsson-pod2:
- installer: fuel
- <<: *brahmaputra
- - lf-pod2:
+ - baremetal:
+ slave-label: fuel-baremetal
installer: fuel
- <<: *brahmaputra
+ <<: *master
- virtual:
+ slave-label: fuel-virtual
+ installer: fuel
+ <<: *master
+ - baremetal:
+ slave-label: fuel-baremetal
installer: fuel
- <<: *brahmaputra
- - huawei-virtual:
- installer: compass
<<: *brahmaputra
- virtual:
- installer: joid
- <<: *brahmaputra
- - arm-pod1:
+ slave-label: fuel-virtual
installer: fuel
<<: *brahmaputra
-#--------------------------------
-# master
-#--------------------------------
+
+# just in case if things go wrong
- lf-pod2:
+ slave-label: fuel-baremetal
installer: fuel
<<: *master
- - intel-pod6:
- installer: joid
+#--------------------------------
+# Installers not using labels
+# CI PODs
+# This section should only contain the installers
+# that have not been switched using labels for slaves
+#--------------------------------
+ - intel-pod7:
+ slave-label: '{pod}'
+ installer: apex
<<: *master
+ - lf-pod1:
+ slave-label: '{pod}'
+ installer: apex
+ <<: *brahmaputra
- intel-pod8:
+ slave-label: '{pod}'
installer: compass
<<: *master
- - intel-pod7:
- installer: apex
- <<: *master
- - ericsson-pod1:
- installer: fuel
+ - huawei-pod1:
+ slave-label: '{pod}'
+ installer: compass
+ <<: *brahmaputra
+ - intel-pod6:
+ slave-label: '{pod}'
+ installer: joid
<<: *master
+ - intel-pod5:
+ slave-label: '{pod}'
+ installer: joid
+ <<: *brahmaputra
+#--------------------------------
+# None-CI PODs
+#--------------------------------
+ - orange-pod2:
+ slave-label: '{pod}'
+ installer: joid
+ <<: *brahmaputra
- orange-pod5:
+ slave-label: '{pod}'
installer: fuel
<<: *master
- orange-pod2:
+ slave-label: '{pod}'
installer: joid
<<: *master
- - virtual:
- installer: fuel
- <<: *master
- huawei-virtual:
+ slave-label: '{pod}'
installer: compass
<<: *master
- virtual:
+ slave-label: '{pod}'
installer: joid
<<: *master
- huawei-pod2:
+ slave-label: '{pod}'
installer: compass
<<: *master
- huawei-pod1:
+ slave-label: '{pod}'
installer: compass
<<: *master
- nokia-pod1:
+ slave-label: '{pod}'
installer: apex
<<: *master
- arm-pod1:
+ slave-label: '{pod}'
installer: fuel
<<: *master
- zte-pod1:
+ slave-label: '{pod}'
installer: fuel
<<: *master
+ - arm-pod1:
+ slave-label: '{pod}'
+ installer: fuel
+ <<: *brahmaputra
+ - huawei-virtual:
+ slave-label: '{pod}'
+ installer: compass
+ <<: *brahmaputra
+ - virtual:
+ slave-label: '{pod}'
+ installer: joid
+ <<: *brahmaputra
#--------------------------------
testsuite:
@@ -138,7 +167,7 @@
parameters:
- project-parameter:
project: '{project}'
- - '{pod}-defaults'
+ - '{slave-label}-defaults'
- '{installer}-defaults'
- 'functest-{testsuite}-parameter'
- string:
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'
diff --git a/jjb/releng-macros.yaml b/jjb/releng-macros.yaml
index d7f9be109..cdbb0bac3 100644
--- a/jjb/releng-macros.yaml
+++ b/jjb/releng-macros.yaml
@@ -57,6 +57,11 @@
fail: true
- trigger:
+ name: 'daily-trigger-disabled'
+ triggers:
+ - timed: ''
+
+- trigger:
name: 'brahmaputra-trigger-daily-disabled'
triggers:
- timed: ''
diff --git a/jjb/yardstick/yardstick-ci-jobs.yml b/jjb/yardstick/yardstick-ci-jobs.yml
index 55a07a520..c6630d7bc 100644
--- a/jjb/yardstick/yardstick-ci-jobs.yml
+++ b/jjb/yardstick/yardstick-ci-jobs.yml
@@ -22,152 +22,148 @@
#--------------------------------
# POD, INSTALLER, AND BRANCH MAPPING
#--------------------------------
-# brahmaputra
+# Installers using labels
+# CI PODs
+# This section should only contain the installers
+# that have been switched using labels for slaves
#--------------------------------
pod:
- - lf-pod1:
- installer: apex
- suite: daily
- auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
- <<: *brahmaputra
- - lf-pod2:
+ - baremetal:
+ slave-label: fuel-baremetal
installer: fuel
- suite: daily
auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
- <<: *brahmaputra
- - intel-pod5:
- installer: joid
- suite: daily
- auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
- <<: *brahmaputra
- - orange-pod2:
- installer: joid
- suite: daily
- auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
- <<: *brahmaputra
- - huawei-pod1:
- installer: compass
- suite: daily
- auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
- <<: *brahmaputra
- - ericsson-pod1:
+ <<: *master
+ - virtual:
+ slave-label: fuel-virtual
installer: fuel
- suite: daily
auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
- <<: *brahmaputra
- - ericsson-pod2:
+ <<: *master
+ - baremetal:
+ slave-label: fuel-baremetal
installer: fuel
- suite: daily
auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
<<: *brahmaputra
- virtual:
+ slave-label: fuel-virtual
installer: fuel
- suite: daily
- auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
- <<: *brahmaputra
- - huawei-virtual:
- installer: compass
- suite: daily
auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
<<: *brahmaputra
- - virtual:
- installer: joid
- suite: daily
+
+# just in case if things go wrong
+ - lf-pod2:
+ slave-label: '{pod}'
+ installer: fuel
auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
- <<: *brahmaputra
+ <<: *master
#--------------------------------
-# master
+# Installers not using labels
+# CI PODs
+# This section should only contain the installers
+# that have not been switched using labels for slaves
#--------------------------------
- lf-pod1:
+ slave-label: '{pod}'
installer: apex
- suite: daily
auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
<<: *master
- - lf-pod2:
- installer: fuel
- suite: daily
+ - lf-pod1:
+ slave-label: '{pod}'
+ installer: apex
auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
- <<: *master
- - ericsson-pod1:
- installer: fuel
- suite: daily
+ <<: *brahmaputra
+ - intel-pod8:
+ slave-label: '{pod}'
+ installer: compass
auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
<<: *master
- - ericsson-pod1:
- installer: fuel
- suite: vtcdaily
- auto-trigger-name: 'yardstick-vtcdaily-ericsson-pod1-trigger'
- <<: *master
- - ericsson-pod2:
- installer: fuel
- suite: daily
+ - huawei-pod1:
+ slave-label: '{pod}'
+ installer: compass
auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
- <<: *master
+ <<: *brahmaputra
- intel-pod6:
+ slave-label: '{pod}'
installer: joid
- suite: daily
auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
<<: *master
- - intel-pod8:
- installer: compass
- suite: daily
+ - intel-pod5:
+ slave-label: '{pod}'
+ installer: joid
auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
- <<: *master
+ <<: *brahmaputra
+#--------------------------------
+# None-CI PODs
+#--------------------------------
+ - orange-pod2:
+ slave-label: '{pod}'
+ installer: joid
+ auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
+ <<: *brahmaputra
- zte-pod1:
+ slave-label: '{pod}'
installer: fuel
- suite: daily
auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
<<: *master
- orange-pod2:
+ slave-label: '{pod}'
installer: joid
- suite: daily
auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
<<: *master
- huawei-pod1:
+ slave-label: '{pod}'
installer: compass
suite: daily
auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
<<: *master
- huawei-pod2:
+ slave-label: '{pod}'
installer: compass
- suite: daily
auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
<<: *master
- - virtual:
- installer: fuel
- suite: daily
auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
<<: *master
- huawei-virtual:
+ slave-label: '{pod}'
installer: compass
- suite: daily
auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
<<: *master
- huawei-pod3:
+ slave-label: '{pod}'
installer: compass
- suite: daily
auto-trigger-name: 'yardstick-daily-huawei-pod3-trigger'
<<: *master
- huawei-pod4:
+ slave-label: '{pod}'
installer: compass
- suite: daily
auto-trigger-name: 'yardstick-daily-huawei-pod4-trigger'
<<: *master
- virtual:
+ slave-label: '{pod}'
installer: joid
- suite: daily
auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
<<: *master
+ - huawei-virtual:
+ slave-label: '{pod}'
+ installer: compass
+ auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
+ <<: *brahmaputra
+ - virtual:
+ slave-label: '{pod}'
+ installer: joid
+ auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
+ <<: *brahmaputra
#--------------------------------
+ testsuite:
+ - 'daily'
jobs:
- - 'yardstick-{installer}-{pod}-{suite}-{stream}'
+ - 'yardstick-{installer}-{pod}-{testsuite}-{stream}'
################################
# job templates
################################
- job-template:
- name: 'yardstick-{installer}-{pod}-{suite}-{stream}'
+ name: 'yardstick-{installer}-{pod}-{testsuite}-{stream}'
disabled: false
@@ -191,9 +187,9 @@
parameters:
- project-parameter:
project: '{project}'
- - '{pod}-defaults'
+ - '{slave-label}-defaults'
- '{installer}-defaults'
- - 'yardstick-params-{pod}'
+ - 'yardstick-params-{slave-label}'
- string:
name: DEPLOY_SCENARIO
default: 'os-odl_l2-nofeature-ha'
@@ -203,7 +199,7 @@
description: 'Tag to pull docker image'
- string:
name: YARDSTICK_SUITE_NAME
- default: opnfv_${{NODE_NAME}}_{suite}.yaml
+ default: opnfv_${{NODE_NAME}}_{testsuite}.yaml
description: 'Path to test suite'
- string:
name: CI_DEBUG
@@ -219,7 +215,7 @@
builders:
- 'yardstick-cleanup'
#- 'yardstick-fetch-os-creds'
- - 'yardstick-{suite}'
+ - 'yardstick-{testsuite}'
publishers:
- email:
@@ -277,9 +273,8 @@
name: YARDSTICK_DB_BACKEND
default: ''
description: 'Arguments to use in order to choose the backend DB'
-
- parameter:
- name: 'yardstick-params-ericsson-pod1'
+ name: 'yardstick-params-lf-pod1'
parameters:
- string:
name: YARDSTICK_DB_BACKEND
@@ -287,15 +282,14 @@
description: 'Arguments to use in order to choose the backend DB'
- parameter:
- name: 'yardstick-params-ericsson-pod2'
+ name: 'yardstick-params-lf-pod2'
parameters:
- string:
name: YARDSTICK_DB_BACKEND
default: '-i 104.197.68.199:8086'
description: 'Arguments to use in order to choose the backend DB'
-
- parameter:
- name: 'yardstick-params-lf-pod1'
+ name: 'yardstick-params-fuel-baremetal'
parameters:
- string:
name: YARDSTICK_DB_BACKEND
@@ -303,11 +297,11 @@
description: 'Arguments to use in order to choose the backend DB'
- parameter:
- name: 'yardstick-params-lf-pod2'
+ name: 'yardstick-params-fuel-virtual'
parameters:
- string:
name: YARDSTICK_DB_BACKEND
- default: '-i 104.197.68.199:8086'
+ default: ''
description: 'Arguments to use in order to choose the backend DB'
- parameter:
@@ -379,11 +373,6 @@
#######################
# trigger for PODs to only run yardstick test suites
- trigger:
- name: 'yardstick-vtcdaily-ericsson-pod1-trigger'
- triggers:
- - timed: '0 1 * * *'
-
-- trigger:
name: 'yardstick-daily-huawei-pod3-trigger'
triggers:
- timed: '0 1 * * *'