diff options
| author |   liang gao <jean.gaoliang@huawei.com> | 2016-06-08 03:31:31 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-06-08 03:31:31 +0000 |
| commit | f42719d1347b60bf7d99226221f3a5b51a3b0a25 (patch) | |
| tree | 9b0f7fbe7a24caac2a19a97d9fd5ca4728033483 /tests | |
| parent | 22174dcc54a358d886a718e8c36d0d50e742a468 (diff) | |
| parent | 1be7d52ff4a3685973e8f6ad441f954c46efeaa7 (diff) | |
Merge "rename test suite script"
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/ci/docker/yardstick-ci/Dockerfile | 3 | ||||
| -rwxr-xr-x | tests/ci/docker/yardstick-ci/exec_tests.sh (renamed from tests/ci/docker/yardstick-ci/run_tests.sh) | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/tests/ci/docker/yardstick-ci/Dockerfile b/tests/ci/docker/yardstick-ci/Dockerfile index a2164a8a2..cc23073d2 100644 --- a/tests/ci/docker/yardstick-ci/Dockerfile +++ b/tests/ci/docker/yardstick-ci/Dockerfile @@ -49,5 +49,4 @@ RUN cd ${YARDSTICK_REPO_DIR} && pip install . ADD http://download.cirros-cloud.net/0.3.3/cirros-0.3.3-x86_64-disk.img /home/opnfv/images/ -COPY ./run_tests.sh /usr/local/bin/ - +COPY ./exec_tests.sh /usr/local/bin/ diff --git a/tests/ci/docker/yardstick-ci/run_tests.sh b/tests/ci/docker/yardstick-ci/exec_tests.sh index 680a329ca..9aee240da 100755 --- a/tests/ci/docker/yardstick-ci/run_tests.sh +++ b/tests/ci/docker/yardstick-ci/exec_tests.sh @@ -11,7 +11,7 @@ set -e : ${YARDSTICK_REPO:='https://gerrit.opnfv.org/gerrit/yardstick'} -: ${YARDSTICK_REPO_DIR:='/home/opnfv/yardstick'} +: ${YARDSTICK_REPO_DIR:='/home/opnfv/repos/yardstick'} : ${YARDSTICK_BRANCH:='master'} # branch, tag, sha1 or refspec : ${RELENG_REPO:='https://gerrit.opnfv.org/gerrit/releng'} @@ -51,5 +51,5 @@ git_checkout $YARDSTICK_BRANCH $YARDSTICK_REPO # setup the environment source $YARDSTICK_REPO_DIR/tests/ci/prepare_env.sh -# run tests +# execute tests $YARDSTICK_REPO_DIR/tests/ci/yardstick-verify $@ |