summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
authormei mei <meimei@huawei.com>2018-03-16 03:53:27 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-03-16 03:53:27 +0000
commit112eb0719a5139191e7fd58a1a5b72bcb3a3694d (patch)
tree0506b136ea727e873a99cf4cf9219ddaa445a710 /jjb
parentabd754f9358035062d977c46b4e9e0a171cf5261 (diff)
parentc6453e19166ea239768819af305af40bd9f7bd06 (diff)
Merge "Bottlenecks testcase online"
Diffstat (limited to 'jjb')
-rw-r--r--jjb/bottlenecks/bottlenecks-ci-jobs.yml5
-rw-r--r--jjb/bottlenecks/bottlenecks-run-suite.sh11
-rw-r--r--jjb/compass4nfv/compass-ci-jobs.yml10
3 files changed, 20 insertions, 6 deletions
diff --git a/jjb/bottlenecks/bottlenecks-ci-jobs.yml b/jjb/bottlenecks/bottlenecks-ci-jobs.yml
index 1d31f2775..367bb6482 100644
--- a/jjb/bottlenecks/bottlenecks-ci-jobs.yml
+++ b/jjb/bottlenecks/bottlenecks-ci-jobs.yml
@@ -73,6 +73,11 @@
suite:
- 'posca_stress_traffic'
- 'posca_stress_ping'
+ - 'posca_factor_multistack_storage'
+ - 'posca_factor_multistack_storage_parallel'
+ - 'posca_feature_moon_resources'
+ - 'posca_feature_moon_tenants'
+ - 'posca_feature_vnf_scale_out'
jobs:
- 'bottlenecks-{installer}-{suite}-{pod}-daily-{stream}'
diff --git a/jjb/bottlenecks/bottlenecks-run-suite.sh b/jjb/bottlenecks/bottlenecks-run-suite.sh
index ebd905e98..7a3db00c4 100644
--- a/jjb/bottlenecks/bottlenecks-run-suite.sh
+++ b/jjb/bottlenecks/bottlenecks-run-suite.sh
@@ -136,13 +136,12 @@ if [[ $SUITE_NAME == *posca* ]]; then
# Running test cases through Bottlenecks docker
if [[ $SUITE_NAME == posca_stress_traffic ]]; then
TEST_CASE=posca_factor_system_bandwidth
- testcase_cmd="docker exec bottlenecks-load-master python ${POSCA_SCRIPT}/../run_testsuite.py testcase $TEST_CASE $REPORT"
- echo "BOTTLENECKS INFO: running test case ${TEST_CASE} with report indicator: ${testcase_cmd}"
- ${testcase_cmd} >$redirect
elif [[ $SUITE_NAME == posca_stress_ping ]]; then
TEST_CASE=posca_factor_ping
- testcase_cmd="docker exec bottlenecks-load-master python ${POSCA_SCRIPT}/../run_testsuite.py testcase $TEST_CASE $REPORT"
- echo "BOTTLENECKS INFO: running test case ${TEST_CASE} with report indicator: ${testcase_cmd}"
- ${testcase_cmd} >$redirect
+ else
+ TEST_CASE=$SUITE_NAME
fi
+ testcase_cmd="docker exec bottlenecks-load-master python ${POSCA_SCRIPT}/../run_testsuite.py testcase $TEST_CASE $REPORT"
+ echo "BOTTLENECKS INFO: running test case ${TEST_CASE} with report indicator: ${testcase_cmd}"
+ ${testcase_cmd} >$redirect
fi
diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml
index 357f24e37..2ef43881c 100644
--- a/jjb/compass4nfv/compass-ci-jobs.yml
+++ b/jjb/compass4nfv/compass-ci-jobs.yml
@@ -289,6 +289,16 @@
build-step-failure-threshold: 'never'
failure-threshold: 'never'
unstable-threshold: 'FAILURE'
+ - project: 'bottlenecks-compass-posca_factor_multistack_storage_parallel-{pod}-daily-{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: