summaryrefslogtreecommitdiffstats
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
parent68c799b07b5fb1239dced84de0f2f3f7e2dfe446 (diff)
rename test suite script
JIRA: YARDSTICK-279 Change-Id: I70accc9a79b59447c907057c386f14f6a4f38346 Signed-off-by: MatthewLi <matthew.lijun@huawei.com>
-rw-r--r--docs/userguide/03-installation.rst7
-rwxr-xr-xrun_tests.sh2
-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
4 files changed, 10 insertions, 6 deletions
diff --git a/docs/userguide/03-installation.rst b/docs/userguide/03-installation.rst
index 1a7495547..a3144ef2c 100644
--- a/docs/userguide/03-installation.rst
+++ b/docs/userguide/03-installation.rst
@@ -171,7 +171,7 @@ Run the Docker image:
-e "INSTALLER_TYPE=${INSTALLER_TYPE}" \
-e "INSTALLER_IP=${INSTALLER_IP}" \
opnfv/yardstick \
- run_tests.sh ${YARDSTICK_DB_BACKEND} ${YARDSTICK_SUITE_NAME}
+ exec_tests.sh ${YARDSTICK_DB_BACKEND} ${YARDSTICK_SUITE_NAME}
Where ``${INSTALLER_TYPE}`` can be apex, compass, fuel or joid, ``${INSTALLER_IP}``
is the installer master node IP address (i.e. 10.20.0.2 is default for fuel). ``${YARDSTICK_DB_BACKEND}``
@@ -180,6 +180,11 @@ For more details, please refer to the Jenkins job defined in Releng project, lab
and sshkey are required. See the link
https://git.opnfv.org/cgit/releng/tree/jjb/yardstick/yardstick-ci-jobs.yml.
+Note: exec_tests.sh is used for executing test suite here, furthermore, if someone wants to execute the
+test suite manually, it can be used as long as the parameters are configured correct. Another script
+called run_tests.sh is used for unittest in Jenkins verify job, in local manaul environment,
+it is recommended to run before test suite execuation.
+
Basic steps performed by the **Yardstick-CI** container:
1. clone yardstick and releng repos
diff --git a/run_tests.sh b/run_tests.sh
index 82c8251ff..972f6a27f 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -9,7 +9,7 @@
# http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
-# Run yardstick's test suite(s)
+# Run yardstick's flake8, unit, coverage, functional test
getopts ":f" FILE_OPTION
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 $@