summaryrefslogtreecommitdiffstats
path: root/tests/ci/docker
diff options
context:
space:
mode:
authorMatthewLi <matthew.lijun@huawei.com>2016-05-26 02:02:39 -0400
committerMatthewLi <matthew.lijun@huawei.com>2016-06-01 22:04:20 -0400
commit1be7d52ff4a3685973e8f6ad441f954c46efeaa7 (patch)
treecb41db6d942d914bcfd1bc61b9e1c6bcebaf3670 /tests/ci/docker
parent68c799b07b5fb1239dced84de0f2f3f7e2dfe446 (diff)
rename test suite script
JIRA: YARDSTICK-279 Change-Id: I70accc9a79b59447c907057c386f14f6a4f38346 Signed-off-by: MatthewLi <matthew.lijun@huawei.com>
Diffstat (limited to 'tests/ci/docker')
-rw-r--r--tests/ci/docker/yardstick-ci/Dockerfile3
-rwxr-xr-xtests/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 $@