diff options
| author |   Morgan Richomme <morgan.richomme@orange.com> | 2016-11-16 07:16:42 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2016-11-16 07:16:42 +0000 |
| commit | 7256df5aa9d1135e5c8d080e3ca2f1744783142e (patch) | |
| tree | bea9979ae3ad6199b0a4215f1378bcbb633e457c | |
| parent | cd2e2d67016b78517f86a2cafad9f3f23adc94d7 (diff) | |
| parent | 56a8a8c2ca7092eec328cbfc462d6c6a984e05e6 (diff) | |
Merge "Wrap the Functest and install it as module by pip."
| -rw-r--r-- | docker/Dockerfile | 4 | ||||
| -rw-r--r-- | setup.py | 51 |
2 files changed, 30 insertions, 25 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index e8cef3c0c..37581a671 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -40,9 +40,7 @@ ENV repos_dir /home/opnfv/repos ENV creds /home/opnfv/functest/conf/openstack.creds ENV TERM xterm ENV COLORTERM gnome-terminal -ENV PYTHONPATH $PYTHONPATH:/home/opnfv/repos/ ENV CONFIG_FUNCTEST_YAML /home/opnfv/repos/functest/functest/ci/config_functest.yaml -ENV PYTHONPATH $PYTHONPATH:/home/opnfv/repos/:/home/opnfv/repos/functest WORKDIR /home/opnfv # Packaged dependencies @@ -105,6 +103,7 @@ RUN git clone --depth 1 -b $VIMS_TAG https://github.com/boucherv-orange/clearwat RUN git clone --depth 1 https://github.com/wuwenbin2/OnosSystemTest.git ${repos_dir}/onos RUN pip install -r ${repos_dir}/functest/docker/requirements.pip +RUN cd ${repos_dir}/functest && pip install . RUN pip install -r ${repos_dir}/rally/requirements.txt RUN pip install -r ${repos_dir}/tempest/requirements.txt @@ -156,4 +155,3 @@ RUN echo set nocompatible >> /home/opnfv/.exrc RUN echo "alias ll='ls -lh' \n\ . /home/opnfv/repos/functest/functest/cli/functest-complete.sh" \ >> /home/opnfv/.bashrc -RUN cd ${repos_dir}/functest/functest/cli && pip install . @@ -1,22 +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 -############################################################################## - -from setuptools import setup, find_packages - - -setup( - name="functest", - version="master", - packages=find_packages(), - include_package_data=True, - package_data={ - }, - url="https://www.opnfv.org", - install_requires=["coverage==4.1", - "mock==1.3.0", - "nose==1.3.7"], -) +##############################################################################
+# 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
+##############################################################################
+
+from setuptools import setup, find_packages
+
+
+setup(
+ name="functest",
+ version="master",
+ py_modules=['cli_base'],
+ packages=find_packages(),
+ include_package_data=True,
+ package_data={
+ },
+ url="https://www.opnfv.org",
+ install_requires=["coverage==4.1",
+ "mock==1.3.0",
+ "nose==1.3.7",
+ "click"],
+ entry_points={
+ 'console_scripts': [
+ 'functest=functest.cli.cli_base:cli'
+ ],
+ },
+)
|