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>

1 files changed, 79 insertions, 90 deletions

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 * * *'