summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
authormeimei <meimei@huawei.com>2017-01-14 09:26:49 +0800
committermei mei <meimei@huawei.com>2017-01-16 03:38:58 +0000
commitc6f4b730fbc2818f7acfbc931a6b5be38b349aef (patch)
tree996ecfd6cee6b1da4ea8f33e721b0bb3173cb843 /jjb
parentd8fbf3739d441c9c3388a5543bb7f6a1c282cf1d (diff)
[compass] enable healthcheck and vping as smoke test in verify job
Change-Id: I7b4ad69b1c7c7b59b9feadef8808a1ef81a34367 Signed-off-by: meimei <meimei@huawei.com>
Diffstat (limited to 'jjb')
-rw-r--r--jjb/compass4nfv/compass-verify-jobs.yml29
-rwxr-xr-xjjb/functest/functest-suite.sh4
2 files changed, 22 insertions, 11 deletions
diff --git a/jjb/compass4nfv/compass-verify-jobs.yml b/jjb/compass4nfv/compass-verify-jobs.yml
index 2277e92ab..8feda04e3 100644
--- a/jjb/compass4nfv/compass-verify-jobs.yml
+++ b/jjb/compass4nfv/compass-verify-jobs.yml
@@ -132,17 +132,24 @@
node-parameters: true
kill-phase-on: FAILURE
abort-all-job: true
-# - multijob:
-# name: smoke-test
-# condition: SUCCESSFUL
-# projects:
-# - name: 'functest-compass-virtual-suite-{stream}'
-# current-parameters: true
-# predefined-parameters:
-# FUNCTEST_SUITE_NAME=healthcheck
-# node-parameters: true
-# kill-phase-on: NEVER
-# abort-all-job: true
+ - multijob:
+ name: smoke-test
+ condition: SUCCESSFUL
+ projects:
+ - name: 'functest-compass-virtual-suite-{stream}'
+ current-parameters: true
+ predefined-parameters:
+ FUNCTEST_SUITE_NAME=healthcheck
+ node-parameters: true
+ kill-phase-on: NEVER
+ abort-all-job: true
+ - name: 'functest-compass-virtual-suite-{stream}'
+ current-parameters: true
+ predefined-parameters:
+ FUNCTEST_SUITE_NAME=vping_ssh
+ node-parameters: true
+ kill-phase-on: NEVER
+ abort-all-job: true
- job-template:
name: 'compass-verify-{phase}-{distro}-{stream}'
diff --git a/jjb/functest/functest-suite.sh b/jjb/functest/functest-suite.sh
index a30fb5973..9dc8deca0 100755
--- a/jjb/functest/functest-suite.sh
+++ b/jjb/functest/functest-suite.sh
@@ -12,3 +12,7 @@ else
fi
container_id=$(docker ps -a | grep opnfv/functest | awk '{print $1}' | head -1)
docker exec $container_id $cmd
+
+ret_value=$?
+
+exit $ret_value