X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fyardstick%2Fyardstick-daily-jobs.yml;h=9814d47eff4c7c7cca9a33feecd8010135e4e338;hb=6cd969c1abf6ef04a21430c2acaadbd969838d3e;hp=1ae79e12f94201ab0eb0e38c93d93d973ed106d9;hpb=443fcbc2e1adf401e303bcce67b0aa33e4b97c2d;p=releng.git

diff --git a/jjb/yardstick/yardstick-daily-jobs.yml b/jjb/yardstick/yardstick-daily-jobs.yml
index 1ae79e12f..9814d47ef 100644
--- a/jjb/yardstick/yardstick-daily-jobs.yml
+++ b/jjb/yardstick/yardstick-daily-jobs.yml
@@ -15,8 +15,8 @@
       branch: '{stream}'
       gs-pathname: ''
       docker-tag: 'latest'
-    euphrates: &euphrates
-      stream: euphrates
+    fraser: &fraser
+      stream: fraser
       branch: 'stable/{stream}'
       gs-pathname: '{stream}'
       docker-tag: 'stable'
@@ -41,15 +41,15 @@
           auto-trigger-name: 'daily-trigger-disabled'
           <<: *master
       - virtual:
-          slave-label: apex-virtual-euphrates
+          slave-label: apex-virtual-fraser
           installer: apex
           auto-trigger-name: 'daily-trigger-disabled'
-          <<: *euphrates
+          <<: *fraser
       - baremetal:
-          slave-label: apex-baremetal-euphrates
+          slave-label: apex-baremetal-fraser
           installer: apex
           auto-trigger-name: 'daily-trigger-disabled'
-          <<: *euphrates
+          <<: *fraser
       # fuel CI PODs
       - baremetal:
           slave-label: fuel-baremetal
@@ -65,12 +65,12 @@
           slave-label: fuel-baremetal
           installer: fuel
           auto-trigger-name: 'daily-trigger-disabled'
-          <<: *euphrates
+          <<: *fraser
       - virtual:
           slave-label: fuel-virtual
           installer: fuel
           auto-trigger-name: 'daily-trigger-disabled'
-          <<: *euphrates
+          <<: *fraser
       # armband CI PODs
       - armband-baremetal:
           slave-label: armband-baremetal
@@ -86,12 +86,12 @@
           slave-label: armband-baremetal
           installer: fuel
           auto-trigger-name: 'daily-trigger-disabled'
-          <<: *euphrates
+          <<: *fraser
       - armband-virtual:
           slave-label: armband-virtual
           installer: fuel
           auto-trigger-name: 'daily-trigger-disabled'
-          <<: *euphrates
+          <<: *fraser
       # joid CI PODs
       - baremetal:
           slave-label: joid-baremetal
@@ -107,12 +107,12 @@
           slave-label: joid-baremetal
           installer: joid
           auto-trigger-name: 'daily-trigger-disabled'
-          <<: *euphrates
+          <<: *fraser
       - virtual:
           slave-label: joid-virtual
           installer: joid
           auto-trigger-name: 'daily-trigger-disabled'
-          <<: *euphrates
+          <<: *fraser
       # compass CI PODs
       - baremetal:
           slave-label: compass-baremetal
@@ -128,12 +128,28 @@
           slave-label: compass-baremetal
           installer: compass
           auto-trigger-name: 'daily-trigger-disabled'
-          <<: *euphrates
+          <<: *fraser
       - virtual:
           slave-label: compass-virtual
           installer: compass
           auto-trigger-name: 'daily-trigger-disabled'
-          <<: *euphrates
+          <<: *fraser
+      # daisy CI PODs
+      - baremetal:
+          slave-label: daisy-baremetal
+          installer: daisy
+          auto-trigger-name: 'daily-trigger-disabled'
+          <<: *master
+      - baremetal:
+          slave-label: daisy-baremetal
+          installer: daisy
+          auto-trigger-name: 'daily-trigger-disabled'
+          <<: *fraser
+      - virtual:
+          slave-label: daisy-virtual
+          installer: daisy
+          auto-trigger-name: 'daily-trigger-disabled'
+          <<: *master
       # -------------------------------
       #        None-CI PODs
       # -------------------------------
@@ -151,22 +167,22 @@
           slave-label: '{pod}'
           installer: fuel
           auto-trigger-name: 'daily-trigger-disabled'
-          <<: *euphrates
+          <<: *fraser
       - zte-pod2:
           slave-label: '{pod}'
-          installer: fuel
+          installer: daisy
           auto-trigger-name: 'daily-trigger-disabled'
           <<: *master
       - zte-pod3:
           slave-label: '{pod}'
-          installer: fuel
+          installer: daisy
           auto-trigger-name: 'daily-trigger-disabled'
           <<: *master
       - zte-pod3:
           slave-label: '{pod}'
-          installer: fuel
+          installer: daisy
           auto-trigger-name: 'daily-trigger-disabled'
-          <<: *euphrates
+          <<: *fraser
       - orange-pod2:
           slave-label: '{pod}'
           installer: joid
@@ -256,8 +272,7 @@
       - description-setter:
           description: "POD: $NODE_NAME"
       - 'yardstick-cleanup'
-      - 'yardstick-fetch-os-creds'
-      - 'yardstick-fetch-k8s-conf'
+      - 'yardstick-fetch-creds'
       - 'yardstick-{testsuite}'
       - 'yardstick-store-results'
 
@@ -276,22 +291,23 @@
           !include-raw: ./yardstick-daily.sh
 
 - builder:
-    name: yardstick-vtcdaily
-    builders:
-      - shell:
-          !include-raw: ./yardstick-vtcdaily.sh
-
-- builder:
-    name: yardstick-fetch-os-creds
-    builders:
-      - shell:
-          !include-raw: ../../utils/fetch_os_creds.sh
-
-- builder:
-    name: yardstick-fetch-k8s-conf
+    name: yardstick-fetch-creds
     builders:
-      - shell:
-          !include-raw: ./yardstick-get-k8s-conf.sh
+      # yamllint disable rule:indentation
+      - conditional-step:
+          condition-kind: regex-match
+          regex: "os-.*"
+          label: '$DEPLOY_SCENARIO'
+          steps:
+            - shell:
+                !include-raw: ../../utils/fetch_os_creds.sh
+      - conditional-step:
+          condition-kind: regex-match
+          regex: "k8-.*"
+          label: '$DEPLOY_SCENARIO'
+          steps:
+            - shell:
+                !include-raw: ./yardstick-get-k8s-conf.sh
 
 - builder:
     name: yardstick-store-results
@@ -324,7 +340,7 @@
           description: 'Arguments to use in order to choose the backend DB'
 
 - parameter:
-    name: 'yardstick-params-apex-virtual-euphrates'
+    name: 'yardstick-params-apex-virtual-fraser'
     parameters:
       - string:
           name: YARDSTICK_DB_BACKEND
@@ -332,7 +348,7 @@
           description: 'Arguments to use in order to choose the backend DB'
 
 - parameter:
-    name: 'yardstick-params-apex-baremetal-euphrates'
+    name: 'yardstick-params-apex-baremetal-fraser'
     parameters:
       - string:
           name: YARDSTICK_DB_BACKEND
@@ -403,6 +419,22 @@
           default: '-i 104.197.68.199:8086'
           description: 'Arguments to use in order to choose the backend DB'
 
+- parameter:
+    name: 'yardstick-params-daisy-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-daisy-virtual'
+    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-zte-pod1'
     parameters: