From 26ef381564304b410b7cbfb268a491ca547bc350 Mon Sep 17 00:00:00 2001 From: Zhijiang Hu Date: Thu, 19 Apr 2018 15:10:44 +0800 Subject: [daisy]Enable yardstick daily jobs on zte-pod3 and zte-pod9 Change-Id: Ib96698b1d2d1fa8039fd684ff96025afffefbcd0 Signed-off-by: Zhijiang Hu --- jjb/daisy4nfv/daisy-daily-jobs.yml | 35 ++++++++++++++--------------------- 1 file changed, 14 insertions(+), 21 deletions(-) (limited to 'jjb/daisy4nfv') 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}' -- cgit