Merge "Install RabbitMQ service in Yardstick functional tests"

[releng.git] / jjb / yardstick / yardstick-daily-jobs.yml

diff --git a/jjb/yardstick/yardstick-daily-jobs.yml b/jjb/yardstick/yardstick-daily-jobs.yml
index 481af2a..24c7f31 100644 (file)
--- 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