From e691d00bd44eb10617b9532dedb3eed2458694fc Mon Sep 17 00:00:00 2001
From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Sun, 2 Jul 2017 12:10:29 +0200
Subject: Remove the former link /home/opnfv/repos/functest
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
All operations required have been applied [1].
All documentations are updated as well to close the topic.
It should be noted that runfunctest.rst must be hugely updated
because all $PS1 are wrong.
[1] https://gerrit.opnfv.org/gerrit/#/q/project:functest+branch:master+topic:dockerfile
JIRA: FUNCTEST-836
Change-Id: I26658be109fd785d068389816be4260cff823705
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
---
docker/Dockerfile | 3 ---
docs/testing/user/configguide/configguide.rst | 4 +---
docs/testing/user/userguide/index.rst | 4 +---
docs/testing/user/userguide/runfunctest.rst | 4 +---
docs/testing/user/userguide/troubleshooting.rst | 2 +-
5 files changed, 4 insertions(+), 13 deletions(-)
diff --git a/docker/Dockerfile b/docker/Dockerfile
index a4a425885..98708dc7c 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -84,9 +84,6 @@ RUN pip install ${PIP_OPTS} \
-r thirdparty-requirements.txt \
&& rm thirdparty-requirements.txt
-# Hook required by hardcoded paths in Functest
-RUN ln -s /usr/local/lib/python2.7/dist-packages/functest ${FUNCTEST_REPO_DIR}/functest
-
# OPNFV repositories
RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/copper ${REPOS_DIR}/copper
RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/domino ${REPOS_DIR}/domino
diff --git a/docs/testing/user/configguide/configguide.rst b/docs/testing/user/configguide/configguide.rst
index 61fc45933..8a444e739 100644
--- a/docs/testing/user/configguide/configguide.rst
+++ b/docs/testing/user/configguide/configguide.rst
@@ -327,9 +327,7 @@ includes two main directories:
the **data** directory stores a 'cirros' test image used in some
functional tests and the **results** directory stores some temporary
result log files
- * The **repos** directory holds various repositories. The directory
- '/home/opnfv/repos/functest' is used to prepare the needed Functest
- environment and to run the tests. The other repository directories
+ * The **repos** directory holds various repositories. The directories
are used for the installation of the needed tooling (e.g. rally) or
for the retrieval of feature projects scenarios (e.g. promise)
diff --git a/docs/testing/user/userguide/index.rst b/docs/testing/user/userguide/index.rst
index c1faecdaa..0041d09b3 100644
--- a/docs/testing/user/userguide/index.rst
+++ b/docs/testing/user/userguide/index.rst
@@ -296,8 +296,6 @@ Inside the Functest container, first to prepare Functest environment:
::
- cd /home/opnfv/repos/functest
- pip install -e .
functest env prepare
then to run default defcore testcases by using refstack-client:
@@ -346,7 +344,7 @@ file is:
::
- cd /home/opnfv/repos/functest/functest/opnfv_tests/openstack/refstack_client
+ cd /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/refstack_client
python tempest_conf.py
a file called tempest.conf is stored in the current path by default, users can do
diff --git a/docs/testing/user/userguide/runfunctest.rst b/docs/testing/user/userguide/runfunctest.rst
index c155e6090..079baddf9 100644
--- a/docs/testing/user/userguide/runfunctest.rst
+++ b/docs/testing/user/userguide/runfunctest.rst
@@ -496,8 +496,6 @@ To execute a Test Tier or Test Case, the 'run' command is used::
and
root@22e436918db0:~/repos/functest/ci# functest testcase run vping_ssh
- Executing command: 'python /home/opnfv/repos/functest/ci/run_tests.py -t vping_ssh'
- 2016-06-30 11:50:31,861 - run_tests - INFO - Sourcing the OpenStack RC file...
2016-06-30 11:50:31,865 - run_tests - INFO - ============================================
2016-06-30 11:50:31,865 - run_tests - INFO - Running test case 'vping_ssh'...
2016-06-30 11:50:31,865 - run_tests - INFO - ============================================
@@ -616,7 +614,7 @@ variables:
* mode = (ha|noha)
The constraints per test case are defined in the Functest configuration file
-*/home/opnfv/repos/functest/functest/ci/testcases.yaml*::
+*/usr/local/lib/python2.7/dist-packages/functest/ci/testcases.yaml*::
tiers:
-
diff --git a/docs/testing/user/userguide/troubleshooting.rst b/docs/testing/user/userguide/troubleshooting.rst
index bcd9e1c84..1c5166081 100644
--- a/docs/testing/user/userguide/troubleshooting.rst
+++ b/docs/testing/user/userguide/troubleshooting.rst
@@ -65,7 +65,7 @@ Notes:
It is actually still possible to invoke test execution, with suppression
of OpenStack resource cleanup, however this requires invocation of a
- **specific Python script:** '/home/opnfv/repos/functest/ci/run_test.py'.
+ **specific Python script:** 'run_tests'.
The `OPNFV Functest Developer Guide`_ provides guidance on the use of that
Python script in such troubleshooting cases.
--
cgit