From: helenyao <yaohelan@huawei.com>
Date: Fri, 25 Nov 2016 03:13:43 +0000 (-0500)
Subject: Lifted requirements.pip one level up to meet the basic structure of OpenStack project.
X-Git-Tag: 0.2~1055^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=e8ad51f917673d54d134d94ede7b6a9f407571f4;p=functest-xtesting.git

Lifted requirements.pip one level up to meet the basic structure of OpenStack project.

JIRA: FUNCTEST-609

1. Lifted the requirements.pip
2. Renamed it to requirements.txt
3. Updated the areas that are affected

Change-Id: If294f07fb5450f3ae6133fd46dc169b9bab451de
Signed-off-by: helenyao <yaohelan@huawei.com>
---

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 9da04fd8..dc772c5b 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -114,7 +114,7 @@ RUN git clone --depth 1 -b $ODL_TAG https://git.opendaylight.org/gerrit/p/integr
 RUN git clone --depth 1 -b $VIMS_TAG https://github.com/boucherv-orange/clearwater-live-test ${REPOS_DIR}/vims-test
 RUN git clone --depth 1 https://github.com/wuwenbin2/OnosSystemTest.git ${REPOS_DIR}/onos
 
-RUN pip install -r ${FUNCTEST_REPO_DIR}/docker/requirements.pip
+RUN pip install -r ${FUNCTEST_REPO_DIR}/requirements.txt
 RUN cd ${FUNCTEST_REPO_DIR} && pip install .
 RUN pip install -r ${REPOS_DIR}/rally/requirements.txt
 RUN pip install -r ${REPOS_DIR}/tempest/requirements.txt
diff --git a/docker/requirements.pip b/requirements.txt
similarity index 90%
rename from docker/requirements.pip
rename to requirements.txt
index 4e795222..98745c3a 100644
--- a/docker/requirements.pip
+++ b/requirements.txt
@@ -1,7 +1,5 @@
 #
 #
-# author: Jose Lausuch (jose.lausuch@ericsson.com)
-#
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Apache License, Version 2.0
 # which accompanies this distribution, and is available at
@@ -28,4 +26,4 @@ paramiko==1.16.0
 subprocess32
 shyaml
 dnspython
-Pillow==3.3.0
\ No newline at end of file
+Pillow==3.3.0
diff --git a/run_unit_tests.sh b/run_unit_tests.sh
index dc5a501a..a2744037 100755
--- a/run_unit_tests.sh
+++ b/run_unit_tests.sh
@@ -43,7 +43,7 @@ source $WORKSPACE/functest_venv/bin/activate
 # install python packages
 easy_install -U setuptools
 easy_install -U pip
-pip install -r $WORKSPACE/docker/requirements.pip
+pip install -r $WORKSPACE/requirements.txt
 pip install -e $WORKSPACE
 
 python $WORKSPACE/setup.py develop