X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Fyardstick%2Fyardstick-daily-jobs.yml;h=24c7f319b44c1029ef6cec3dbef75a1c0f29cfa5;hb=refs%2Fchanges%2F29%2F54229%2F1;hp=481af2a42b11448d5d6ca95e3a0c7c2b6b21e9e4;hpb=542a88c67f869abd95bb374fd05ab36f8a32d2e4;p=releng.git

diff --git a/jjb/yardstick/yardstick-daily-jobs.yml b/jjb/yardstick/yardstick-daily-jobs.yml
index 481af2a42..24c7f319b 100644
--- a/jjb/yardstick/yardstick-daily-jobs.yml
+++ b/jjb/yardstick/yardstick-daily-jobs.yml
@@ -136,7 +136,7 @@
           <<: *euphrates
       # daisy CI PODs
       - baremetal:
-          slave-label: zte-pod3
+          slave-label: daisy-baremetal
           installer: daisy
           auto-trigger-name: 'daily-trigger-disabled'
           <<: *master
@@ -262,8 +262,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'
 
@@ -282,16 +281,23 @@
           !include-raw: ./yardstick-daily.sh
 
 - builder:
-    name: yardstick-fetch-os-creds
+    name: yardstick-fetch-creds
     builders:
-      - shell:
-          !include-raw: ../../utils/fetch_os_creds.sh
-
-- builder:
-    name: yardstick-fetch-k8s-conf
-    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