X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Ffunctest-ci-jobs.yml;h=1ccaa1b1052ae2793f6fda25a4ecab093d6515a8;hb=refs%2Fchanges%2F81%2F14681%2F1;hp=4b11c4bfcb627f6ce98319d44b4208a5914e804f;hpb=10af8e5e9f27b72ec0d0fdf5939147ee15aec36c;p=releng.git

diff --git a/jjb/functest/functest-ci-jobs.yml b/jjb/functest/functest-ci-jobs.yml
index 4b11c4bfc..1ccaa1b10 100644
--- a/jjb/functest/functest-ci-jobs.yml
+++ b/jjb/functest/functest-ci-jobs.yml
@@ -22,87 +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:
+        - baremetal:
+            slave-label: fuel-baremetal
             installer: fuel
-            <<: *brahmaputra
-        - lf-pod2:
-            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:
@@ -135,7 +167,7 @@
     parameters:
         - project-parameter:
             project: '{project}'
-        - '{pod}-defaults'
+        - '{slave-label}-defaults'
         - '{installer}-defaults'
         - 'functest-{testsuite}-parameter'
         - string: