From e8ad51f917673d54d134d94ede7b6a9f407571f4 Mon Sep 17 00:00:00 2001 From: helenyao Date: Thu, 24 Nov 2016 22:13:43 -0500 Subject: 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 --- docker/Dockerfile | 2 +- docker/requirements.pip | 31 ------------------------------- requirements.txt | 29 +++++++++++++++++++++++++++++ run_unit_tests.sh | 2 +- 4 files changed, 31 insertions(+), 33 deletions(-) delete mode 100644 docker/requirements.pip create mode 100644 requirements.txt diff --git a/docker/Dockerfile b/docker/Dockerfile index 9da04fd88..dc772c5b8 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/docker/requirements.pip deleted file mode 100644 index 4e7952222..000000000 --- a/docker/requirements.pip +++ /dev/null @@ -1,31 +0,0 @@ -# -# -# 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 -# http://www.apache.org/licenses/LICENSE-2.0 -# -pyyaml==3.10 -gitpython==1.0.1 -python-openstackclient==2.3.0 -python-ceilometerclient==2.6.2 -python-keystoneclient==3.5.0 -python-neutronclient==6.0.0 -python-congressclient==1.5.0 -virtualenv==1.11.4 -pexpect==4.0 -requests==2.8.0 -robotframework==2.9.1 -robotframework-requests==0.3.8 -robotframework-sshlibrary==2.1.1 -configObj==5.0.6 -Flask==0.10.1 -xmltodict==0.9.2 -scp==0.10.2 -paramiko==1.16.0 -subprocess32 -shyaml -dnspython -Pillow==3.3.0 \ No newline at end of file diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 000000000..98745c3ae --- /dev/null +++ b/requirements.txt @@ -0,0 +1,29 @@ +# +# +# 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 +# http://www.apache.org/licenses/LICENSE-2.0 +# +pyyaml==3.10 +gitpython==1.0.1 +python-openstackclient==2.3.0 +python-ceilometerclient==2.6.2 +python-keystoneclient==3.5.0 +python-neutronclient==6.0.0 +python-congressclient==1.5.0 +virtualenv==1.11.4 +pexpect==4.0 +requests==2.8.0 +robotframework==2.9.1 +robotframework-requests==0.3.8 +robotframework-sshlibrary==2.1.1 +configObj==5.0.6 +Flask==0.10.1 +xmltodict==0.9.2 +scp==0.10.2 +paramiko==1.16.0 +subprocess32 +shyaml +dnspython +Pillow==3.3.0 diff --git a/run_unit_tests.sh b/run_unit_tests.sh index dc5a501a6..a2744037f 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 -- cgit 1.2.3-korg