summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormeimei <meimei@huawei.com>2016-05-24 02:34:57 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-05-24 02:34:57 +0000
commitd1c6148e340770a7725c80fd25387c11bdffe9e2 (patch)
treeb3617e991f7c4d37fdced28af4b81d789e38aec1
parent2d9728c02a90a32f7eebb25681a28e617276378d (diff)
parentac5aa074012103ca462ec4da42e6923f20df7af2 (diff)
Merge "[compass4nfv] use vping as the smoke test of compass4nfv"
-rw-r--r--jjb/compass4nfv/compass-project-jobs.yml17
1 files changed, 14 insertions, 3 deletions
diff --git a/jjb/compass4nfv/compass-project-jobs.yml b/jjb/compass4nfv/compass-project-jobs.yml
index 4898b8726..920923a34 100644
--- a/jjb/compass4nfv/compass-project-jobs.yml
+++ b/jjb/compass4nfv/compass-project-jobs.yml
@@ -6,13 +6,13 @@
project: 'compass4nfv'
+ pod: 'huawei-virtual'
+
stream:
- master:
- slave_name: 'huawei-virtual1'
branch: '{stream}'
gs-pathname: ''
- brahmaputra:
- slave_name: 'huawei-virtual2'
branch: 'stable/{stream}'
gs-pathname: '/{stream}'
@@ -58,8 +58,8 @@
- compass-project-parameter:
installer: '{installer}'
gs-pathname: '{gs-pathname}'
- - 'huawei-virtual-defaults'
- '{installer}-defaults'
+ - '{pod}-defaults'
- string:
name: DEPLOY_SCENARIO
default: 'os-nosdn-nofeature-ha'
@@ -95,6 +95,17 @@
current-parameters: true
same-node: true
block: true
+ - trigger-builds:
+ - project: 'functest-compass-{pod}-suite-{stream}'
+ current-parameters: true
+ predefined-parameters:
+ FUNCTEST_SUITE_NAME=vping_userdata
+ same-node: true
+ block: true
+ block-thresholds:
+ build-step-failure-threshold: 'never'
+ failure-threshold: 'never'
+ unstable-threshold: 'FAILURE'
- job-template:
name: 'compass-verify-deploy-{stream}'