summaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
authorMorgan Richomme <morgan.richomme@orange.com>2016-11-28 16:34:17 +0000
committerGerrit Code Review <gerrit@opnfv.org>2016-11-28 16:34:17 +0000
commit6f01e0b78169aa58ecaa3310c4717bfe96a05d85 (patch)
tree3b4555217d33ce83c90d6fcb1d7b5aa77e974369 /docker
parente2d102a754ddcb3643deba19615f7846618092d2 (diff)
parente8ad51f917673d54d134d94ede7b6a9f407571f4 (diff)
Merge "Lifted requirements.pip one level up to meet the basic structure of OpenStack project."
Diffstat (limited to 'docker')
-rw-r--r--docker/Dockerfile2
-rw-r--r--docker/requirements.pip31
2 files changed, 1 insertions, 32 deletions
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