Merge "[daisy]Enable yardstick daily jobs on zte-pod3 and zte-pod9"

diff --git a/jjb/daisy4nfv/daisy-daily-jobs.yml b/jjb/daisy4nfv/daisy-daily-jobs.yml
index 593d21a..1769bb4 100644 (file)
--- a/jjb/daisy4nfv/daisy-daily-jobs.yml
+++ b/jjb/daisy4nfv/daisy-daily-jobs.yml
@@ -155,27 +155,20 @@
               build-step-failure-threshold: 'never'
               failure-threshold: 'never'
               unstable-threshold: 'FAILURE'
-      - conditional-step:
-          condition-kind: and
-          condition-operands:
-            - condition-kind: regex-match
-              regex: 'baremetal'
-              label: '{pod}'
-          steps:
-            - trigger-builds:
-                - project: 'yardstick-daisy-{pod}-daily-{stream}'
-                  current-parameters: false
-                  predefined-parameters: |
-                    DEPLOY_SCENARIO={scenario}
-                    INSTALLER_VERSION={stream}
-                    UPSTREAM_JOB_NAME=$JOB_NAME
-                    UPSTREAM_BUILD_ID=$BUILD_ID
-                  block: true
-                  same-node: true
-                  block-thresholds:
-                    build-step-failure-threshold: 'never'
-                    failure-threshold: 'never'
-                    unstable-threshold: 'FAILURE'
+      - trigger-builds:
+          - project: 'yardstick-daisy-{pod}-daily-{stream}'
+            current-parameters: false
+            predefined-parameters: |
+              DEPLOY_SCENARIO={scenario}
+              INSTALLER_VERSION={stream}
+              UPSTREAM_JOB_NAME=$JOB_NAME
+              UPSTREAM_BUILD_ID=$BUILD_ID
+            block: true
+            same-node: true
+            block-thresholds:
+              build-step-failure-threshold: 'never'
+              failure-threshold: 'never'
+              unstable-threshold: 'FAILURE'
 
 - job-template:
     name: '{project}-deploy-{pod}-daily-{stream}'

diff --git a/jjb/yardstick/yardstick-daily-jobs.yml b/jjb/yardstick/yardstick-daily-jobs.yml
index 9814d47..4df3f52 100644 (file)
--- a/jjb/yardstick/yardstick-daily-jobs.yml
+++ b/jjb/yardstick/yardstick-daily-jobs.yml
@@ -183,6 +183,16 @@
           installer: daisy
           auto-trigger-name: 'daily-trigger-disabled'
           <<: *fraser
+      - zte-pod9:
+          slave-label: '{pod}'
+          installer: daisy
+          auto-trigger-name: 'daily-trigger-disabled'
+          <<: *master
+      - zte-pod9:
+          slave-label: '{pod}'
+          installer: daisy
+          auto-trigger-name: 'daily-trigger-disabled'
+          <<: *fraser
       - orange-pod2:
           slave-label: '{pod}'
           installer: joid
@@ -459,6 +469,14 @@
           default: '-i 104.197.68.199:8086'
           description: 'Arguments to use in order to choose the backend DB'
 
+- parameter:
+    name: 'yardstick-params-zte-pod9'
+    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-orange-pod1'
     parameters: