diff options
author | rexlee8776 <limingjiang@huawei.com> | 2016-07-15 02:55:53 +0000 |
---|---|---|
committer | mei mei <meimei@huawei.com> | 2016-07-18 12:17:38 +0000 |
commit | 0300af7e215c2f945244dcc1ddb2f771a6ac111b (patch) | |
tree | ac27f6a376edc3bc9e23edf7bfc6a8764a43df9e | |
parent | 0713a6f996ab1cf0bfa6b03c8a0aa548ca0123c5 (diff) |
change ci from base-on-pod to base-on-scenario (in progress)
1. first need to change in yardstick
2. then change in releng to modify the input parameter
JIRA: YARDSTICK-299
Change-Id: Ie9c96d4ddc6b15b0488ef1cff1f2c7531429baf0
Signed-off-by: rexlee8776 <limingjiang@huawei.com>
-rw-r--r-- | jjb/yardstick/yardstick-ci-jobs.yml | 6 | ||||
-rwxr-xr-x | jjb/yardstick/yardstick-daily.sh | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/jjb/yardstick/yardstick-ci-jobs.yml b/jjb/yardstick/yardstick-ci-jobs.yml index 21a6b80b0..6b922889a 100644 --- a/jjb/yardstick/yardstick-ci-jobs.yml +++ b/jjb/yardstick/yardstick-ci-jobs.yml @@ -188,9 +188,9 @@ default: '{docker-tag}' description: 'Tag to pull docker image' - string: - name: YARDSTICK_SUITE_NAME - default: opnfv_${{NODE_NAME}}_{testsuite}.yaml - description: 'Path to test suite' + name: YARDSTICK_SCENARIO_SUITE_NAME + default: opnfv_${{DEPLOY_SCENARIO}}_{testsuite}.yaml + description: 'Path to test scenario suite' - string: name: CI_DEBUG default: 'false' diff --git a/jjb/yardstick/yardstick-daily.sh b/jjb/yardstick/yardstick-daily.sh index 176f1b985..e8df9be58 100755 --- a/jjb/yardstick/yardstick-daily.sh +++ b/jjb/yardstick/yardstick-daily.sh @@ -33,7 +33,7 @@ docker pull opnfv/yardstick:$DOCKER_TAG >$redirect # Run docker cmd="sudo docker run ${opts} ${envs} ${labconfig} ${sshkey} opnfv/yardstick \ - exec_tests.sh ${YARDSTICK_DB_BACKEND} ${YARDSTICK_SUITE_NAME}" + exec_tests.sh ${YARDSTICK_DB_BACKEND} ${YARDSTICK_SCENARIO_SUITE_NAME}" echo "Yardstick: Running docker cmd: ${cmd}" ${cmd} |