summaryrefslogtreecommitdiffstats
path: root/jjb/compass4nfv
diff options
context:
space:
mode:
authormei mei <meimei@huawei.com>2018-07-18 06:31:46 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-07-18 06:31:46 +0000
commit4cb31b2b027b53c3eb7b5f8a8a4b230687999543 (patch)
tree924ad9b56f39e057e4dfa111a9e93c603afe379c /jjb/compass4nfv
parent91669b39a0a6023cee20578f49efe6e633738b06 (diff)
parenta91b3afb5814f9a6374444c6557b4d7e227cb42a (diff)
Merge "[dovetail] Run mandatory and optional test cases with 2 jobs"
Diffstat (limited to 'jjb/compass4nfv')
-rw-r--r--jjb/compass4nfv/compass-ci-jobs.yaml9
1 files changed, 5 insertions, 4 deletions
diff --git a/jjb/compass4nfv/compass-ci-jobs.yaml b/jjb/compass4nfv/compass-ci-jobs.yaml
index 298173e85..337d63042 100644
--- a/jjb/compass4nfv/compass-ci-jobs.yaml
+++ b/jjb/compass4nfv/compass-ci-jobs.yaml
@@ -214,8 +214,8 @@
unstable-threshold: 'FAILURE'
# here the stream means the SUT stream, dovetail stream is defined in its own job
# only run on os-(nosdn|odl_l3)-nofeature-ha scenario
- # run with testsuite default, dovetail docker image with latest tag(Monday, Tuesday)
- # run with testsuite proposed_tests, dovetail docker image with latest tag(Thursday, Friday)
+ # run with testsuite default, testarea mandatory, dovetail docker image with latest tag
+ # run with testsuite default, testarea optional, dovetail docker image with latest tag
- conditional-step:
condition-kind: and
condition-operands:
@@ -224,7 +224,7 @@
label: '{scenario}'
steps:
- trigger-builds:
- - project: 'dovetail-compass-{pod}-default-{stream}'
+ - project: 'dovetail-compass-{pod}-default-mandatory-{stream}'
current-parameters: false
predefined-parameters: |
DOCKER_TAG=latest
@@ -243,9 +243,10 @@
label: '{scenario}'
steps:
- trigger-builds:
- - project: 'dovetail-compass-{pod}-proposed_tests-{stream}'
+ - project: 'dovetail-compass-{pod}-default-optional-{stream}'
current-parameters: false
predefined-parameters:
+ DOCKER_TAG=latest
DEPLOY_SCENARIO={scenario}
block: true
same-node: true