From db6666d61812f940c79f1b00a3223261fd71ad72 Mon Sep 17 00:00:00 2001 From: xudan Date: Tue, 12 Dec 2017 02:45:23 -0500 Subject: [PATCH] Enable jobs on compass Master and Euphrates Dovetail now have jobs on Compass danube on huawei-pod7. Add jobs on Compass master and euphrates. Scenario os-nosdn-nofeature-ha and os-odl_l3-nofeature-ha. JIRA: DOVETAIL-574 Change-Id: I502c59365248122480cdb5be2bb79582150591e4 Signed-off-by: xudan --- jjb/compass4nfv/compass-ci-jobs.yml | 44 ++++++------------------------------- 1 file changed, 7 insertions(+), 37 deletions(-) diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml index 446d0717a..402d3b324 100644 --- a/jjb/compass4nfv/compass-ci-jobs.yml +++ b/jjb/compass4nfv/compass-ci-jobs.yml @@ -207,24 +207,21 @@ 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|onos|odl_l3)-nofeature-ha scenario - # run against SUT master branch, dovetail docker image with latest tag - # run against SUT danube branch, dovetail docker image with latest tag(Monday and Sunday) - # run against SUT danube branch, dovetail docker image with cvp.X.X.X tag(Tuesday, Thursday, Friday and Saturday) + # only run on os-(nosdn|odl_l2|odl_l3)-nofeature-ha scenario + # run against SUT master/euphrates branch, dovetail docker image with latest tag(Monday, Tuesday) + # run against SUT master/euphrates branch, dovetail docker image with cvp.X.X.X tag(Thursday, Friday) + # run against SUT danube branch, dovetail docker image with cvp.X.X.X tag on huawei-pod7 - conditional-step: condition-kind: and condition-operands: - condition-kind: regex-match - regex: danube - label: '{stream}' - - condition-kind: regex-match - regex: os-(nosdn|odl_l2|odl_l3)-nofeature-ha + regex: os-(nosdn|odl_l3)-nofeature-ha label: '{scenario}' - condition-kind: day-of-week day-selector: select-days days: MON: true - SUN: true + TUES: true use-build-time: true steps: - trigger-builds: @@ -243,19 +240,13 @@ condition-kind: and condition-operands: - condition-kind: regex-match - regex: danube - label: '{stream}' - - condition-kind: regex-match - regex: os-(nosdn|odl_l2|odl_l3)-nofeature-ha + regex: os-(nosdn|odl_l3)-nofeature-ha label: '{scenario}' - condition-kind: day-of-week day-selector: select-days days: - TUES: true - WED: true THURS: true FRI: true - SAT: true use-build-time: true steps: - trigger-builds: @@ -269,27 +260,6 @@ build-step-failure-threshold: 'never' failure-threshold: 'never' unstable-threshold: 'FAILURE' - - conditional-step: - condition-kind: and - condition-operands: - - condition-kind: regex-match - regex: os-(nosdn|odl_l2|odl_l3)-nofeature-ha - label: '{scenario}' - - condition-kind: regex-match - regex: master - label: '{stream}' - 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' - conditional-step: condition-kind: and condition-operands: -- 2.16.6