X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fyardstick%2Fyardstick-ci-jobs.yml;h=48c335a03fa49357f7516d8243ab2b920f965d73;hb=b65b34f10e52dbb445b5c2654c67cf9d9a218ecd;hp=3d59e61cee8364458a8adab43fc08f7e35e05bdd;hpb=2e2aaccb68c64732c559594b41d587df49cb6130;p=releng.git

diff --git a/jjb/yardstick/yardstick-ci-jobs.yml b/jjb/yardstick/yardstick-ci-jobs.yml
index 3d59e61ce..48c335a03 100644
--- a/jjb/yardstick/yardstick-ci-jobs.yml
+++ b/jjb/yardstick/yardstick-ci-jobs.yml
@@ -32,51 +32,73 @@
         - baremetal:
             slave-label: fuel-baremetal
             installer: fuel
-            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
+            auto-trigger-name: 'daily-trigger-disabled'
             <<: *master
         - virtual:
             slave-label: fuel-virtual
             installer: fuel
-            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
+            auto-trigger-name: 'daily-trigger-disabled'
             <<: *master
         - baremetal:
             slave-label: fuel-baremetal
             installer: fuel
-            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
+            auto-trigger-name: 'daily-trigger-disabled'
             <<: *brahmaputra
         - virtual:
             slave-label: fuel-virtual
             installer: fuel
-            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
+            auto-trigger-name: 'daily-trigger-disabled'
             <<: *brahmaputra
 
 # just in case if things go wrong
         - lf-pod2:
             slave-label: '{pod}'
             installer: fuel
-            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
+            auto-trigger-name: 'daily-trigger-disabled'
             <<: *master
 
 # joid CI PODs
         - baremetal:
             slave-label: joid-baremetal
             installer: joid
-            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
+            auto-trigger-name: 'daily-trigger-disabled'
             <<: *master
         - virtual:
             slave-label: joid-virtual
             installer: joid
-            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
+            auto-trigger-name: 'daily-trigger-disabled'
             <<: *master
         - baremetal:
             slave-label: joid-baremetal
             installer: joid
-            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
+            auto-trigger-name: 'daily-trigger-disabled'
             <<: *brahmaputra
         - virtual:
             slave-label: joid-virtual
             installer: joid
-            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
+            auto-trigger-name: 'daily-trigger-disabled'
+            <<: *brahmaputra
+
+# compass CI PODs
+        - baremetal:
+            slave-label: compass-baremetal
+            installer: compass
+            auto-trigger-name: 'daily-trigger-disabled'
+            <<: *master
+        - virtual:
+            slave-label: compass-virtual
+            installer: compass
+            auto-trigger-name: 'daily-trigger-disabled'
+            <<: *master
+        - baremetal:
+            slave-label: compass-baremetal
+            installer: compass
+            auto-trigger-name: 'daily-trigger-disabled'
+            <<: *brahmaputra
+        - virtual:
+            slave-label: compass-virtual
+            installer: compass
+            auto-trigger-name: 'daily-trigger-disabled'
             <<: *brahmaputra
 #--------------------------------
 #    Installers not using labels
@@ -87,22 +109,12 @@
         - lf-pod1:
             slave-label: '{pod}'
             installer: apex
-            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
+            auto-trigger-name: 'daily-trigger-disabled'
             <<: *master
         - lf-pod1:
             slave-label: '{pod}'
             installer: apex
-            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
-            <<: *brahmaputra
-        - intel-pod8:
-            slave-label: '{pod}'
-            installer: compass
-            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
-            <<: *master
-        - huawei-pod1:
-            slave-label: '{pod}'
-            installer: compass
-            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
+            auto-trigger-name: 'daily-trigger-disabled'
             <<: *brahmaputra
 #--------------------------------
 #        None-CI PODs
@@ -110,35 +122,22 @@
         - orange-pod2:
             slave-label: '{pod}'
             installer: joid
-            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
+            auto-trigger-name: 'daily-trigger-disabled'
             <<: *brahmaputra
         - zte-pod1:
             slave-label: '{pod}'
             installer: fuel
-            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
+            auto-trigger-name: 'daily-trigger-disabled'
             <<: *master
         - orange-pod2:
             slave-label: '{pod}'
             installer: joid
-            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
-            <<: *master
-        - huawei-pod1:
-            slave-label: '{pod}'
-            installer: compass
-            suite: daily
-            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
+            auto-trigger-name: 'daily-trigger-disabled'
             <<: *master
         - huawei-pod2:
             slave-label: '{pod}'
             installer: compass
-            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
-            <<: *master
-            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
-            <<: *master
-        - huawei-virtual:
-            slave-label: '{pod}'
-            installer: compass
-            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
+            auto-trigger-name: 'daily-trigger-disabled'
             <<: *master
         - huawei-pod3:
             slave-label: '{pod}'
@@ -150,11 +149,6 @@
             installer: compass
             auto-trigger-name: 'yardstick-daily-huawei-pod4-trigger'
             <<: *master
-        - huawei-virtual:
-            slave-label: '{pod}'
-            installer: compass
-            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
-            <<: *brahmaputra
 #--------------------------------
     testsuite:
         - 'daily'
@@ -305,7 +299,7 @@
             description: 'Arguments to use in order to choose the backend DB'
 
 - parameter:
-    name: 'yardstick-params-huawei-pod1'
+    name: 'yardstick-params-compass-baremetal'
     parameters:
         - string:
             name: YARDSTICK_DB_BACKEND
@@ -345,7 +339,7 @@
             description: 'Arguments to use in order to choose the backend DB'
 
 - parameter:
-    name: 'yardstick-params-huawei-virtual'
+    name: 'yardstick-params-compass-virtual'
     parameters:
         - string:
             name: YARDSTICK_DB_BACKEND