X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fyardstick%2Fyardstick-daily-jobs.yml;h=4c54b735a2faf2f11d7e8b1f655ad47978cf6496;hb=c7c82f49e1af644542b2a5fbde8f870eee9c9ff5;hp=4dcface59b2cb09b6ee98ab2e383180dbd0a50d5;hpb=dd984cd636286cd7fa2ab7a1d96e93c7f3e0e99b;p=releng.git

diff --git a/jjb/yardstick/yardstick-daily-jobs.yml b/jjb/yardstick/yardstick-daily-jobs.yml
index 4dcface59..4c54b735a 100644
--- a/jjb/yardstick/yardstick-daily-jobs.yml
+++ b/jjb/yardstick/yardstick-daily-jobs.yml
@@ -14,8 +14,8 @@
         branch: '{stream}'
         gs-pathname: ''
         docker-tag: 'latest'
-    danube: &danube
-        stream: danube
+    euphrates: &euphrates
+        stream: euphrates
         branch: 'stable/{stream}'
         gs-pathname: '{stream}'
         docker-tag: 'stable'
@@ -40,15 +40,15 @@
             auto-trigger-name: 'daily-trigger-disabled'
             <<: *master
         - virtual:
-            slave-label: apex-virtual-danube
+            slave-label: apex-virtual-euphrates
             installer: apex
             auto-trigger-name: 'daily-trigger-disabled'
-            <<: *danube
+            <<: *euphrates
         - baremetal:
-            slave-label: apex-baremetal-danube
+            slave-label: apex-baremetal-euphrates
             installer: apex
             auto-trigger-name: 'daily-trigger-disabled'
-            <<: *danube
+            <<: *euphrates
 # fuel CI PODs
         - baremetal:
             slave-label: fuel-baremetal
@@ -64,12 +64,12 @@
             slave-label: fuel-baremetal
             installer: fuel
             auto-trigger-name: 'daily-trigger-disabled'
-            <<: *danube
+            <<: *euphrates
         - virtual:
             slave-label: fuel-virtual
             installer: fuel
             auto-trigger-name: 'daily-trigger-disabled'
-            <<: *danube
+            <<: *euphrates
 # armband CI PODs
         - armband-baremetal:
             slave-label: armband-baremetal
@@ -85,12 +85,12 @@
             slave-label: armband-baremetal
             installer: fuel
             auto-trigger-name: 'daily-trigger-disabled'
-            <<: *danube
+            <<: *euphrates
         - armband-virtual:
             slave-label: armband-virtual
             installer: fuel
             auto-trigger-name: 'daily-trigger-disabled'
-            <<: *danube
+            <<: *euphrates
 # joid CI PODs
         - baremetal:
             slave-label: joid-baremetal
@@ -106,12 +106,12 @@
             slave-label: joid-baremetal
             installer: joid
             auto-trigger-name: 'daily-trigger-disabled'
-            <<: *danube
+            <<: *euphrates
         - virtual:
             slave-label: joid-virtual
             installer: joid
             auto-trigger-name: 'daily-trigger-disabled'
-            <<: *danube
+            <<: *euphrates
 # compass CI PODs
         - baremetal:
             slave-label: compass-baremetal
@@ -127,12 +127,12 @@
             slave-label: compass-baremetal
             installer: compass
             auto-trigger-name: 'daily-trigger-disabled'
-            <<: *danube
+            <<: *euphrates
         - virtual:
             slave-label: compass-virtual
             installer: compass
             auto-trigger-name: 'daily-trigger-disabled'
-            <<: *danube
+            <<: *euphrates
 #--------------------------------
 #        None-CI PODs
 #--------------------------------
@@ -150,7 +150,7 @@
             slave-label: '{pod}'
             installer: fuel
             auto-trigger-name: 'daily-trigger-disabled'
-            <<: *danube
+            <<: *euphrates
         - zte-pod2:
             slave-label: '{pod}'
             installer: fuel
@@ -165,37 +165,7 @@
             slave-label: '{pod}'
             installer: fuel
             auto-trigger-name: 'daily-trigger-disabled'
-            <<: *danube
-        - arm-pod2:
-            slave-label: '{pod}'
-            installer: fuel
-            auto-trigger-name: 'daily-trigger-disabled'
-            <<: *master
-        - arm-pod2:
-            slave-label: '{pod}'
-            installer: fuel
-            auto-trigger-name: 'daily-trigger-disabled'
-            <<: *danube
-        - arm-pod3:
-            slave-label: '{pod}'
-            installer: fuel
-            auto-trigger-name: 'daily-trigger-disabled'
-            <<: *master
-        - arm-pod3:
-            slave-label: '{pod}'
-            installer: fuel
-            auto-trigger-name: 'daily-trigger-disabled'
-            <<: *danube
-        - arm-virtual1:
-            slave-label: '{pod}'
-            installer: fuel
-            auto-trigger-name: 'daily-trigger-disabled'
-            <<: *master
-        - arm-virtual1:
-            slave-label: '{pod}'
-            installer: fuel
-            auto-trigger-name: 'daily-trigger-disabled'
-            <<: *danube
+            <<: *euphrates
         - orange-pod2:
             slave-label: '{pod}'
             installer: joid
@@ -216,6 +186,11 @@
             installer: compass
             auto-trigger-name: 'daily-trigger-disabled'
             <<: *master
+        - flex-pod1:
+            slave-label: '{pod}'
+            installer: apex
+            auto-trigger-name: 'daily-trigger-disabled'
+            <<: *master
 #--------------------------------
     testsuite:
         - 'daily'
@@ -281,12 +256,14 @@
             description: "POD: $NODE_NAME"
         - 'yardstick-cleanup'
         - 'yardstick-fetch-os-creds'
+        - 'yardstick-fetch-k8s-conf'
         - 'yardstick-{testsuite}'
         - 'yardstick-store-results'
 
     publishers:
         - email:
             recipients: jean.gaoliang@huawei.com limingjiang@huawei.com ross.b.brattain@intel.com
+        - email-jenkins-admins-on-failure
 
 ########################
 # builder macros
@@ -309,6 +286,12 @@
         - shell:
             !include-raw: ../../utils/fetch_os_creds.sh
 
+- builder:
+    name: yardstick-fetch-k8s-conf
+    builders:
+        - shell:
+            !include-raw: ./yardstick-get-k8s-conf.sh
+
 - builder:
     name: yardstick-store-results
     builders:
@@ -338,14 +321,14 @@
             default: '-i 104.197.68.199:8086'
             description: 'Arguments to use in order to choose the backend DB'
 - parameter:
-    name: 'yardstick-params-apex-virtual-danube'
+    name: 'yardstick-params-apex-virtual-euphrates'
     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-apex-baremetal-danube'
+    name: 'yardstick-params-apex-baremetal-euphrates'
     parameters:
         - string:
             name: YARDSTICK_DB_BACKEND
@@ -379,13 +362,6 @@
             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-arm-virtual1'
-    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-joid-baremetal'
     parameters:
@@ -455,15 +431,7 @@
             description: 'Arguments to use in order to choose the backend DB'
 
 - parameter:
-    name: 'yardstick-params-arm-pod2'
-    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-arm-pod3'
+    name: 'yardstick-params-virtual'
     parameters:
         - string:
             name: YARDSTICK_DB_BACKEND
@@ -471,7 +439,7 @@
             description: 'Arguments to use in order to choose the backend DB'
 
 - parameter:
-    name: 'yardstick-params-virtual'
+    name: 'yardstick-params-compass-virtual'
     parameters:
         - string:
             name: YARDSTICK_DB_BACKEND
@@ -479,7 +447,7 @@
             description: 'Arguments to use in order to choose the backend DB'
 
 - parameter:
-    name: 'yardstick-params-compass-virtual'
+    name: 'yardstick-params-huawei-pod3'
     parameters:
         - string:
             name: YARDSTICK_DB_BACKEND
@@ -487,7 +455,7 @@
             description: 'Arguments to use in order to choose the backend DB'
 
 - parameter:
-    name: 'yardstick-params-huawei-pod3'
+    name: 'yardstick-params-huawei-pod4'
     parameters:
         - string:
             name: YARDSTICK_DB_BACKEND
@@ -495,7 +463,7 @@
             description: 'Arguments to use in order to choose the backend DB'
 
 - parameter:
-    name: 'yardstick-params-huawei-pod4'
+    name: 'yardstick-params-flex-pod1'
     parameters:
         - string:
             name: YARDSTICK_DB_BACKEND
@@ -514,4 +482,4 @@
 - trigger:
     name: 'yardstick-daily-huawei-pod4-trigger'
     triggers:
-        - timed: '0 1 * * *'
+        - timed: ''