From 5922d6b54ad1231b1bb5446a72f33a21220d1cbb Mon Sep 17 00:00:00 2001
From: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
Date: Thu, 26 May 2016 00:01:52 +0200
Subject: 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>
---
 jjb/functest/functest-ci-jobs.yml | 38 +++++++++++++++++---------------------
 1 file changed, 17 insertions(+), 21 deletions(-)

(limited to 'jjb/functest')

diff --git a/jjb/functest/functest-ci-jobs.yml b/jjb/functest/functest-ci-jobs.yml
index 24673612b..d7e37292a 100644
--- a/jjb/functest/functest-ci-jobs.yml
+++ b/jjb/functest/functest-ci-jobs.yml
@@ -69,6 +69,23 @@
             slave-label: joid-virtual
             installer: joid
             <<: *brahmaputra
+# compass CI PODs
+        - baremetal:
+            slave-label: compass-baremetal
+            installer: compass
+            <<: *master
+        - virtual:
+            slave-label: compass-virtual
+            installer: compass
+            <<: *master
+        - baremetal:
+            slave-label: compass-baremetal
+            installer: compass
+            <<: *brahmaputra
+        - virtual:
+            slave-label: compass-virtual
+            installer: compass
+            <<: *brahmaputra
 #--------------------------------
 #    Installers not using labels
 #            CI PODs
@@ -83,14 +100,6 @@
             slave-label: '{pod}'
             installer: apex
             <<: *brahmaputra
-        - intel-pod8:
-            slave-label: '{pod}'
-            installer: compass
-            <<: *master
-        - huawei-pod1:
-            slave-label: '{pod}'
-            installer: compass
-            <<: *brahmaputra
 #--------------------------------
 #        None-CI PODs
 #--------------------------------
@@ -106,18 +115,10 @@
             slave-label: '{pod}'
             installer: joid
             <<: *master
-        - huawei-virtual:
-            slave-label: '{pod}'
-            installer: compass
-            <<: *master
         - huawei-pod2:
             slave-label: '{pod}'
             installer: compass
             <<: *master
-        - huawei-pod1:
-            slave-label: '{pod}'
-            installer: compass
-            <<: *master
         - nokia-pod1:
             slave-label: '{pod}'
             installer: apex
@@ -134,10 +135,6 @@
             slave-label: '{pod}'
             installer: fuel
             <<: *brahmaputra
-        - huawei-virtual:
-            slave-label: '{pod}'
-            installer: compass
-            <<: *brahmaputra
 #--------------------------------
 
     testsuite:
@@ -263,7 +260,6 @@
         - 'set-functest-env'
         - 'functest-suite'
 
-
 - builder:
     name: functest-suite
     builders:
-- 
cgit 1.2.3-korg