summaryrefslogtreecommitdiffstats
path: root/jjb/compass4nfv
diff options
context:
space:
mode:
authormei mei <meimei@huawei.com>2017-12-13 03:23:21 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-12-13 03:23:21 +0000
commitf924c2d6265466f01a3a30c7ea810f728514b000 (patch)
tree3e46546615816fcdab27c7655ac79cf42fe991e6 /jjb/compass4nfv
parenteecfc2a537a35f46aad5ddc617579b73e9a9c0fc (diff)
parentdb6666d61812f940c79f1b00a3223261fd71ad72 (diff)
Merge "Enable jobs on compass Master and Euphrates"
Diffstat (limited to 'jjb/compass4nfv')
-rw-r--r--jjb/compass4nfv/compass-ci-jobs.yml44
1 files changed, 7 insertions, 37 deletions
diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml
index 8927044bc..a0d553c18 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:
@@ -273,27 +264,6 @@
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:
- - condition-kind: regex-match
regex: os-nosdn-nofeature-ha
label: '{scenario}'
steps: