X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fyardstick%2Fyardstick-ci-jobs.yml;h=041eabd03d77ce3ab58f23814d199f9cefaf5ea5;hb=a606f48f5b7450b1ee53d5de77192b9d375466ac;hp=c6630d7bcf05956e5314d8351d75786c5c344bbf;hpb=ce4601a1ddc92b32afeef181644fdab09287d948;p=releng.git

diff --git a/jjb/yardstick/yardstick-ci-jobs.yml b/jjb/yardstick/yardstick-ci-jobs.yml
index c6630d7bc..041eabd03 100644
--- a/jjb/yardstick/yardstick-ci-jobs.yml
+++ b/jjb/yardstick/yardstick-ci-jobs.yml
@@ -28,33 +28,70 @@
 # that have been switched using labels for slaves
 #--------------------------------
     pod:
+# fuel CI PODs
         - 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
+# joid CI PODs
+        - baremetal:
+            slave-label: joid-baremetal
+            installer: joid
+            auto-trigger-name: 'daily-trigger-disabled'
+            <<: *master
+        - virtual:
+            slave-label: joid-virtual
+            installer: joid
+            auto-trigger-name: 'daily-trigger-disabled'
+            <<: *master
+        - baremetal:
+            slave-label: joid-baremetal
+            installer: joid
+            auto-trigger-name: 'daily-trigger-disabled'
+            <<: *brahmaputra
+        - virtual:
+            slave-label: joid-virtual
+            installer: joid
+            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'
+# 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
 #            CI PODs
@@ -64,32 +101,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'
-            <<: *brahmaputra
-        - intel-pod6:
-            slave-label: '{pod}'
-            installer: joid
-            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
-            <<: *master
-        - intel-pod5:
-            slave-label: '{pod}'
-            installer: joid
-            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
+            auto-trigger-name: 'daily-trigger-disabled'
             <<: *brahmaputra
 #--------------------------------
 #        None-CI PODs
@@ -97,35 +114,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}'
@@ -137,21 +141,6 @@
             installer: compass
             auto-trigger-name: 'yardstick-daily-huawei-pod4-trigger'
             <<: *master
-        - virtual:
-            slave-label: '{pod}'
-            installer: joid
-            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
-            <<: *master
-        - huawei-virtual:
-            slave-label: '{pod}'
-            installer: compass
-            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
-            <<: *brahmaputra
-        - virtual:
-            slave-label: '{pod}'
-            installer: joid
-            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
-            <<: *brahmaputra
 #--------------------------------
     testsuite:
         - 'daily'
@@ -173,6 +162,7 @@
         - throttle:
             enabled: true
             max-per-node: 1
+            option: 'project'
 
     wrappers:
         - build-name:
@@ -198,9 +188,9 @@
             default: '{docker-tag}'
             description: 'Tag to pull docker image'
         - string:
-            name: YARDSTICK_SUITE_NAME
-            default: opnfv_${{NODE_NAME}}_{testsuite}.yaml
-            description: 'Path to test suite'
+            name: YARDSTICK_SCENARIO_SUITE_NAME
+            default: opnfv_${{DEPLOY_SCENARIO}}_{testsuite}.yaml
+            description: 'Path to test scenario suite'
         - string:
             name: CI_DEBUG
             default: 'false'
@@ -213,6 +203,8 @@
             branch: '{branch}'
 
     builders:
+        - description-setter:
+            description: "POD: $NODE_NAME"
         - 'yardstick-cleanup'
         #- 'yardstick-fetch-os-creds'
         - 'yardstick-{testsuite}'
@@ -251,45 +243,50 @@
 # parameter macros
 ########################
 - parameter:
-    name: 'yardstick-params-intel-pod5'
+    name: 'yardstick-params-fuel-baremetal'
     parameters:
         - string:
             name: YARDSTICK_DB_BACKEND
             default: '-i 104.197.68.199:8086'
             description: 'Arguments to use in order to choose the backend DB'
-
 - parameter:
-    name: 'yardstick-params-intel-pod6'
+    name: 'yardstick-params-fuel-virtual'
+    parameters:
+        - string:
+            name: YARDSTICK_DB_BACKEND
+            default: ''
+            description: 'Arguments to use in order to choose the backend DB'
+- parameter:
+    name: 'yardstick-params-joid-baremetal'
     parameters:
         - string:
             name: YARDSTICK_DB_BACKEND
             default: '-i 104.197.68.199:8086'
             description: 'Arguments to use in order to choose the backend DB'
-
 - parameter:
-    name: 'yardstick-params-intel-pod8'
+    name: 'yardstick-params-joid-virtual'
     parameters:
         - string:
             name: YARDSTICK_DB_BACKEND
             default: ''
             description: 'Arguments to use in order to choose the backend DB'
 - parameter:
-    name: 'yardstick-params-lf-pod1'
+    name: 'yardstick-params-intel-pod8'
     parameters:
         - string:
             name: YARDSTICK_DB_BACKEND
-            default: '-i 104.197.68.199:8086'
+            default: ''
             description: 'Arguments to use in order to choose the backend DB'
-
 - parameter:
-    name: 'yardstick-params-lf-pod2'
+    name: 'yardstick-params-lf-pod1'
     parameters:
         - string:
             name: YARDSTICK_DB_BACKEND
             default: '-i 104.197.68.199:8086'
             description: 'Arguments to use in order to choose the backend DB'
+
 - parameter:
-    name: 'yardstick-params-fuel-baremetal'
+    name: 'yardstick-params-lf-pod2'
     parameters:
         - string:
             name: YARDSTICK_DB_BACKEND
@@ -297,15 +294,15 @@
             description: 'Arguments to use in order to choose the backend DB'
 
 - parameter:
-    name: 'yardstick-params-fuel-virtual'
+    name: 'yardstick-params-compass-baremetal'
     parameters:
         - string:
             name: YARDSTICK_DB_BACKEND
-            default: ''
+            default: '-i 104.197.68.199:8086'
             description: 'Arguments to use in order to choose the backend DB'
 
 - parameter:
-    name: 'yardstick-params-huawei-pod1'
+    name: 'yardstick-params-huawei-pod2'
     parameters:
         - string:
             name: YARDSTICK_DB_BACKEND
@@ -313,7 +310,7 @@
             description: 'Arguments to use in order to choose the backend DB'
 
 - parameter:
-    name: 'yardstick-params-huawei-pod2'
+    name: 'yardstick-params-zte-pod1'
     parameters:
         - string:
             name: YARDSTICK_DB_BACKEND
@@ -321,7 +318,7 @@
             description: 'Arguments to use in order to choose the backend DB'
 
 - parameter:
-    name: 'yardstick-params-zte-pod1'
+    name: 'yardstick-params-zte-pod3'
     parameters:
         - string:
             name: YARDSTICK_DB_BACKEND
@@ -345,7 +342,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