From 96064751495ebf0cec8ffe30507bc6b80893fc1c Mon Sep 17 00:00:00 2001 From: MatthewLi Date: Mon, 15 May 2017 23:05:12 -0400 Subject: [PATCH] dovetail: conditional steps to run against specific scenarios JIRA: DOVETAIL-432 1, the community CI resource is limited, for dovetail CI job, there's no need to run against all scenarios, by now, nosdn-nofeature-ha odl_l2-bgpvpn-ha odl_l2-nofeature-ha is enough. 2, jenkins conditional plugin will be used. plugin should be installed https://wiki.jenkins-ci.org/display/JENKINS/Conditional+BuildStep+Plugin 3, take compass as an example to see if it works Change-Id: Ib23835cbf8801c36e35e088cd0d8bf2d6380e81a Signed-off-by: MatthewLi --- jjb/compass4nfv/compass-ci-jobs.yml | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml index 61845acdf..7cd73484c 100644 --- a/jjb/compass4nfv/compass-ci-jobs.yml +++ b/jjb/compass4nfv/compass-ci-jobs.yml @@ -157,19 +157,25 @@ build-step-failure-threshold: 'never' failure-threshold: 'never' unstable-threshold: 'FAILURE' - #dovetail only master by now, not sync with A/B/C branches - #here the stream means the SUT stream, dovetail stream is defined in its own job - - trigger-builds: - - project: 'dovetail-compass-{pod}-proposed_tests-{stream}' - current-parameters: false - predefined-parameters: - DEPLOY_SCENARIO={scenario} - block: true - same-node: true - block-thresholds: - build-step-failure-threshold: 'never' - failure-threshold: 'never' - unstable-threshold: 'FAILURE' + # dovetail only master by now, not sync with A/B/C branches + # here the stream means the SUT stream, dovetail stream is defined in its own job + # only run on os-(nosdn|odl_l2)-(nofeature|bgpvpn)-ha scenario + - conditional-step: + condition-kind: regex-match + regex: os-(nosdn|odl_l2)-(nofeature|bgpvpn)-ha + label: ${scenario} + steps: + - trigger-builds: + - project: 'dovetail-compass-{pod}-proposed_tests-{stream}' + current-parameters: false + predefined-parameters: + DEPLOY_SCENARIO={scenario} + block: true + same-node: true + block-thresholds: + build-step-failure-threshold: 'never' + failure-threshold: 'never' + unstable-threshold: 'FAILURE' - job-template: name: 'compass-deploy-{pod}-daily-{stream}' -- 2.16.6