Tie all verify/merge/build to opnfv-build-ubuntu

[releng.git] / jjb / functest / functest-ci-jobs.yml

diff --git a/jjb/functest/functest-ci-jobs.yml b/jjb/functest/functest-ci-jobs.yml
index 2467361..8bbed4f 100644 (file)
--- a/jjb/functest/functest-ci-jobs.yml
+++ b/jjb/functest/functest-ci-jobs.yml
@@ -69,28 +69,32 @@
             slave-label: joid-virtual
             installer: joid
             <<: *brahmaputra
-#--------------------------------
-#    Installers not using labels
-#            CI PODs
-# This section should only contain the installers
-# that have not been switched using labels for slaves
-#--------------------------------
-        - intel-pod7:
+# 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
+# apex CI PODs
+        - apex-verify-master:
             slave-label: '{pod}'
             installer: apex
             <<: *master
-        - lf-pod1:
+        - apex-daily-master:
             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 +110,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 +130,6 @@
             slave-label: '{pod}'
             installer: fuel
             <<: *brahmaputra
-        - huawei-virtual:
-            slave-label: '{pod}'
-            installer: compass
-            <<: *brahmaputra
 #--------------------------------
 
     testsuite:
@@ -235,7 +227,7 @@
             description: "Push the results of all the tests to the resultDB"
         - string:
             name: CI_DEBUG
-            default: 'true'
+            default: 'false'
             description: "Show debug output information"
 ########################
 # trigger macros
@@ -263,7 +255,6 @@
         - 'set-functest-env'
         - 'functest-suite'
 
-
 - builder:
     name: functest-suite
     builders: