aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--docs/userguide/03-installation.rst21
-rw-r--r--tests/opnfv/test_suites/opnfv_huawei-pod1_daily.yaml (renamed from tests/opnfv/test_suites/opnfv_huawei-us-deploy-bare-1_daily.yaml)0
-rw-r--r--tests/opnfv/test_suites/opnfv_huawei-pod1_weekly.yaml (renamed from tests/opnfv/test_suites/opnfv_huawei-us-deploy-bare-1_weekly.yaml)0
-rw-r--r--tests/opnfv/test_suites/opnfv_huawei-pod3_daily.yaml (renamed from tests/opnfv/test_suites/opnfv_huawei-sh-test-2_daily.yaml)0
-rw-r--r--tests/opnfv/test_suites/opnfv_huawei-pod4_daily.yaml (renamed from tests/opnfv/test_suites/opnfv_huawei-sh-pod6_daily.yaml)0
-rw-r--r--tests/opnfv/test_suites/opnfv_huawei-virtual1_daily.yaml (renamed from tests/opnfv/test_suites/opnfv_huawei-us-deploy-vm-1_daily.yaml)0
-rw-r--r--tests/opnfv/test_suites/opnfv_huawei-virtual2_daily.yaml (renamed from tests/opnfv/test_suites/opnfv_huawei-us-deploy-vm-2_daily.yaml)0
-rw-r--r--tests/opnfv/test_suites/opnfv_huawei-virtual3_daily.yaml (renamed from tests/opnfv/test_suites/opnfv_huawei-us-deploy-vm-3_daily.yaml)0
-rw-r--r--tests/opnfv/test_suites/opnfv_huawei-virtual4_daily.yaml (renamed from tests/opnfv/test_suites/opnfv_huawei-us-deploy-vm-4_daily.yaml)0
9 files changed, 14 insertions, 7 deletions
diff --git a/docs/userguide/03-installation.rst b/docs/userguide/03-installation.rst
index f68c1d9d7..1a7495547 100644
--- a/docs/userguide/03-installation.rst
+++ b/docs/userguide/03-installation.rst
@@ -1,7 +1,7 @@
.. This work is licensed under a Creative Commons Attribution 4.0 International
.. License.
.. http://creativecommons.org/licenses/by/4.0
-.. (c) OPNFV, Ericsson AB and others.
+.. (c) OPNFV, Ericsson AB, Huawei Technologies Co.,Ltd and others.
Yardstick Installation
======================
@@ -155,7 +155,10 @@ Pull the Yardstick-CI Docker image from Docker hub:
::
- docker pull opnfv/yardstick-ci
+ docker pull opnfv/yardstick:$DOCKER_TAG
+
+Where ``$DOCKER_TAG`` is latest for master branch, as for the release branches,
+this coincides with its release name, such as brahmaputra.1.0.
Run the Docker image:
@@ -167,11 +170,15 @@ Run the Docker image:
-t \
-e "INSTALLER_TYPE=${INSTALLER_TYPE}" \
-e "INSTALLER_IP=${INSTALLER_IP}" \
- opnfv/yardstick-ci \
- run_benchmarks
-
-Where ``${INSTALLER_TYPE}`` can be fuel, foreman or compass and ``${INSTALLER_IP}``
-is the installer master node IP address (i.e. 10.20.0.2 is default for fuel).
+ opnfv/yardstick \
+ run_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}``
+is the IP and port number of DB, ``${YARDSTICK_SUITE_NAME}`` is the test suite you want to run.
+For more details, please refer to the Jenkins job defined in Releng project, labconfig information
+and sshkey are required. See the link
+https://git.opnfv.org/cgit/releng/tree/jjb/yardstick/yardstick-ci-jobs.yml.
Basic steps performed by the **Yardstick-CI** container:
diff --git a/tests/opnfv/test_suites/opnfv_huawei-us-deploy-bare-1_daily.yaml b/tests/opnfv/test_suites/opnfv_huawei-pod1_daily.yaml
index 3a3bfccc0..3a3bfccc0 100644
--- a/tests/opnfv/test_suites/opnfv_huawei-us-deploy-bare-1_daily.yaml
+++ b/tests/opnfv/test_suites/opnfv_huawei-pod1_daily.yaml
diff --git a/tests/opnfv/test_suites/opnfv_huawei-us-deploy-bare-1_weekly.yaml b/tests/opnfv/test_suites/opnfv_huawei-pod1_weekly.yaml
index cda46969d..cda46969d 100644
--- a/tests/opnfv/test_suites/opnfv_huawei-us-deploy-bare-1_weekly.yaml
+++ b/tests/opnfv/test_suites/opnfv_huawei-pod1_weekly.yaml
diff --git a/tests/opnfv/test_suites/opnfv_huawei-sh-test-2_daily.yaml b/tests/opnfv/test_suites/opnfv_huawei-pod3_daily.yaml
index 5569a0912..5569a0912 100644
--- a/tests/opnfv/test_suites/opnfv_huawei-sh-test-2_daily.yaml
+++ b/tests/opnfv/test_suites/opnfv_huawei-pod3_daily.yaml
diff --git a/tests/opnfv/test_suites/opnfv_huawei-sh-pod6_daily.yaml b/tests/opnfv/test_suites/opnfv_huawei-pod4_daily.yaml
index 486425f1b..486425f1b 100644
--- a/tests/opnfv/test_suites/opnfv_huawei-sh-pod6_daily.yaml
+++ b/tests/opnfv/test_suites/opnfv_huawei-pod4_daily.yaml
diff --git a/tests/opnfv/test_suites/opnfv_huawei-us-deploy-vm-1_daily.yaml b/tests/opnfv/test_suites/opnfv_huawei-virtual1_daily.yaml
index bb87fc363..bb87fc363 100644
--- a/tests/opnfv/test_suites/opnfv_huawei-us-deploy-vm-1_daily.yaml
+++ b/tests/opnfv/test_suites/opnfv_huawei-virtual1_daily.yaml
diff --git a/tests/opnfv/test_suites/opnfv_huawei-us-deploy-vm-2_daily.yaml b/tests/opnfv/test_suites/opnfv_huawei-virtual2_daily.yaml
index bb87fc363..bb87fc363 100644
--- a/tests/opnfv/test_suites/opnfv_huawei-us-deploy-vm-2_daily.yaml
+++ b/tests/opnfv/test_suites/opnfv_huawei-virtual2_daily.yaml
diff --git a/tests/opnfv/test_suites/opnfv_huawei-us-deploy-vm-3_daily.yaml b/tests/opnfv/test_suites/opnfv_huawei-virtual3_daily.yaml
index bb87fc363..bb87fc363 100644
--- a/tests/opnfv/test_suites/opnfv_huawei-us-deploy-vm-3_daily.yaml
+++ b/tests/opnfv/test_suites/opnfv_huawei-virtual3_daily.yaml
diff --git a/tests/opnfv/test_suites/opnfv_huawei-us-deploy-vm-4_daily.yaml b/tests/opnfv/test_suites/opnfv_huawei-virtual4_daily.yaml
index bb87fc363..bb87fc363 100644
--- a/tests/opnfv/test_suites/opnfv_huawei-us-deploy-vm-4_daily.yaml
+++ b/tests/opnfv/test_suites/opnfv_huawei-virtual4_daily.yaml