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>

2 files changed, 39 insertions, 58 deletions

diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml
index 40f5445dd..7ce926890 100644
--- a/jjb/compass4nfv/compass-ci-jobs.yml
+++ b/jjb/compass4nfv/compass-ci-jobs.yml
@@ -14,33 +14,35 @@
         stream: brahmaputra
         branch: 'stable/{stream}'
         gs-pathname: '/{stream}'
-
 #--------------------------------
 # POD, INSTALLER, AND BRANCH MAPPING
 #--------------------------------
-    pod:
-#--------------------------------
-#        brahmaputra
+#        CI PODs
 #--------------------------------
-        - huawei-pod1:
+    pod:
+        - baremetal:
+            slave-label: compass-baremetal
+            os-version: 'trusty'
+            <<: *master
+        - virtual:
+            slave-label: compass-virtual
+            os-version: 'trusty'
+            <<: *master
+        - baremetal:
+            slave-label: compass-baremetal
             os-version: 'trusty'
             <<: *brahmaputra
-        - huawei-virtual:
+        - virtual:
+            slave-label: compass-virtual
             os-version: 'trusty'
             <<: *brahmaputra
 #--------------------------------
 #        master
 #--------------------------------
         - huawei-pod2:
+            slave-label: '{pod}'
             os-version: 'centos7'
             <<: *master
-#        - intel-pod8:
-        - huawei-pod1:
-            os-version: 'trusty'
-            <<: *master
-        - huawei-virtual:
-            os-version: 'trusty'
-            <<: *master
 
     scenario:
         - 'os-nosdn-nofeature-ha':
@@ -95,7 +97,7 @@
         - string:
             name: DEPLOY_SCENARIO
             default: '{scenario}'
-        - '{pod}-defaults'
+        - '{slave-label}-defaults'
         - '{installer}-defaults'
 
     triggers:
@@ -164,7 +166,7 @@
         - compass-ci-parameter:
             installer: '{installer}'
             gs-pathname: '{gs-pathname}'
-        - '{pod}-defaults'
+        - '{slave-label}-defaults'
         - '{installer}-defaults'
 
     scm:
@@ -235,105 +237,84 @@
         - timed: ''
 
 - trigger:
-    name: 'compass-os-nosdn-nofeature-ha-huawei-pod1-master-trigger'
+    name: 'compass-os-nosdn-nofeature-ha-baremetal-master-trigger'
     triggers:
         - timed: '0 3 * * *'
 - trigger:
-    name: 'compass-os-odl_l2-nofeature-ha-huawei-pod1-master-trigger'
+    name: 'compass-os-odl_l2-nofeature-ha-baremetal-master-trigger'
     triggers:
         - timed: '0 21 * * *'
 - trigger:
-    name: 'compass-os-odl_l3-nofeature-ha-huawei-pod1-master-trigger'
+    name: 'compass-os-odl_l3-nofeature-ha-baremetal-master-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'compass-os-onos-nofeature-ha-huawei-pod1-master-trigger'
+    name: 'compass-os-onos-nofeature-ha-baremetal-master-trigger'
     triggers:
         - timed: '0 15 * * *'
 - trigger:
-    name: 'compass-os-ocl-nofeature-ha-huawei-pod1-master-trigger'
+    name: 'compass-os-ocl-nofeature-ha-baremetal-master-trigger'
     triggers:
         - timed: '0 9 * * *'
 
 - trigger:
-    name: 'compass-os-nosdn-nofeature-ha-huawei-pod1-brahmaputra-trigger'
-    triggers:
-        - timed: ''
-- trigger:
-    name: 'compass-os-odl_l2-nofeature-ha-huawei-pod1-brahmaputra-trigger'
-    triggers:
-        - timed: ''
-- trigger:
-    name: 'compass-os-odl_l3-nofeature-ha-huawei-pod1-brahmaputra-trigger'
-    triggers:
-        - timed: ''
-- trigger:
-    name: 'compass-os-onos-nofeature-ha-huawei-pod1-brahmaputra-trigger'
-    triggers:
-        - timed: ''
-- trigger:
-    name: 'compass-os-ocl-nofeature-ha-huawei-pod1-brahmaputra-trigger'
-    triggers:
-        - timed: ''
-
-- trigger:
-    name: 'compass-os-nosdn-nofeature-ha-intel-pod8-master-trigger'
+    name: 'compass-os-nosdn-nofeature-ha-baremetal-brahmaputra-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'compass-os-odl_l2-nofeature-ha-intel-pod8-master-trigger'
+    name: 'compass-os-odl_l2-nofeature-ha-baremetal-brahmaputra-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'compass-os-odl_l3-nofeature-ha-intel-pod8-master-trigger'
+    name: 'compass-os-odl_l3-nofeature-ha-baremetal-brahmaputra-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'compass-os-onos-nofeature-ha-intel-pod8-master-trigger'
+    name: 'compass-os-onos-nofeature-ha-baremetal-brahmaputra-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'compass-os-ocl-nofeature-ha-intel-pod8-master-trigger'
+    name: 'compass-os-ocl-nofeature-ha-baremetal-brahmaputra-trigger'
     triggers:
         - timed: ''
 
 - trigger:
-    name: 'compass-os-nosdn-nofeature-ha-huawei-virtual-master-trigger'
+    name: 'compass-os-nosdn-nofeature-ha-virtual-master-trigger'
     triggers:
         - timed: '0 3 * * *'
 - trigger:
-    name: 'compass-os-odl_l2-nofeature-ha-huawei-virtual-master-trigger'
+    name: 'compass-os-odl_l2-nofeature-ha-virtual-master-trigger'
     triggers:
         - timed: '0 21 * * *'
 - trigger:
-    name: 'compass-os-odl_l3-nofeature-ha-huawei-virtual-master-trigger'
+    name: 'compass-os-odl_l3-nofeature-ha-virtual-master-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'compass-os-onos-nofeature-ha-huawei-virtual-master-trigger'
+    name: 'compass-os-onos-nofeature-ha-virtual-master-trigger'
     triggers:
         - timed: '0 15 * * *'
 - trigger:
-    name: 'compass-os-ocl-nofeature-ha-huawei-virtual-master-trigger'
+    name: 'compass-os-ocl-nofeature-ha-virtual-master-trigger'
     triggers:
         - timed: '0 9 * * *'
 - trigger:
-    name: 'compass-os-nosdn-nofeature-ha-huawei-virtual-brahmaputra-trigger'
+    name: 'compass-os-nosdn-nofeature-ha-virtual-brahmaputra-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'compass-os-odl_l2-nofeature-ha-huawei-virtual-brahmaputra-trigger'
+    name: 'compass-os-odl_l2-nofeature-ha-virtual-brahmaputra-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'compass-os-odl_l3-nofeature-ha-huawei-virtual-brahmaputra-trigger'
+    name: 'compass-os-odl_l3-nofeature-ha-virtual-brahmaputra-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'compass-os-onos-nofeature-ha-huawei-virtual-brahmaputra-trigger'
+    name: 'compass-os-onos-nofeature-ha-virtual-brahmaputra-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'compass-os-ocl-nofeature-ha-huawei-virtual-brahmaputra-trigger'
+    name: 'compass-os-ocl-nofeature-ha-virtual-brahmaputra-trigger'
     triggers:
         - timed: ''
diff --git a/jjb/compass4nfv/compass-project-jobs.yml b/jjb/compass4nfv/compass-project-jobs.yml
index 920923a34..9db709dfe 100644
--- a/jjb/compass4nfv/compass-project-jobs.yml
+++ b/jjb/compass4nfv/compass-project-jobs.yml
@@ -6,7 +6,7 @@
 
     project: 'compass4nfv'
 
-    pod: 'huawei-virtual'
+    pod: 'compass-virtual'
 
     stream:
         - master:
@@ -119,7 +119,7 @@
         - build-blocker:
             use-build-blocker: true
             blocking-jobs:
-                - 'compass-deploy-huawei-virtual-daily-.*?'
+                - 'compass-deploy-virtual-daily-.*?'
             block-level: 'NODE'
 
     scm: