diff options
| author |   Zhijiang Hu <hu.zhijiang@zte.com.cn> | 2018-04-19 15:10:44 +0800 |
|---|---|---|
| committer | Zhijiang Hu <hu.zhijiang@zte.com.cn> | 2018-04-24 10:41:06 +0800 |
| commit | 26ef381564304b410b7cbfb268a491ca547bc350 (patch) | |
| tree | 3ba6469cc0bcbb492e77978b65b69e3f2275c3ae | |
| parent | 6437f370e393f47f384519208f70c75477ac3b0f (diff) | |
[daisy]Enable yardstick daily jobs on zte-pod3 and zte-pod9
Change-Id: Ib96698b1d2d1fa8039fd684ff96025afffefbcd0
Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
| -rw-r--r-- | jjb/daisy4nfv/daisy-daily-jobs.yml | 35 | ||||
| -rw-r--r-- | jjb/yardstick/yardstick-daily-jobs.yml | 18 |
2 files changed, 32 insertions, 21 deletions
diff --git a/jjb/daisy4nfv/daisy-daily-jobs.yml b/jjb/daisy4nfv/daisy-daily-jobs.yml index 593d21ad0..1769bb4da 100644 --- 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 9814d47ef..4df3f520d 100644 --- 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 @@ -460,6 +470,14 @@ 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: - string: |