aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--docker/Dockerfile10
-rwxr-xr-xtestcases/config_functest.py17
2 files changed, 7 insertions, 20 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index f1a28027a..95ef22b5d 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -9,9 +9,14 @@
# $ docker build -t opnfv/functest:tag .
#
# Execution:
-# $ docker run -t -i -e "INSTALLER_TYPE=fuel/foreman" \
-# -e "INSTALLER_IP=10.20.0.2/172.30.10.73" opnfv/functest
+# $ docker run -t -i \
+# -e "INSTALLER_TYPE=fuel/foreman" \
+# -e "INSTALLER_IP=10.20.0.2/172.30.10.73" \
+# -v $(pwd)/config_functest.yaml:/home/opnfv/functest/conf/config_functest.yaml
+# opnfv/functest /bin/bash
#
+# NOTE: providing config_functest.yaml is optional. If not provided, it will
+# use the default one located in the repo
FROM ubuntu:14.04
@@ -49,4 +54,3 @@ RUN git clone https://gerrit.opnfv.org/gerrit/releng ${repos_dir}/releng
RUN git clone https://github.com/openstack/rally.git ${repos_dir}/rally
RUN pip install -r ${repos_dir}/functest/docker/requirements.pip
-RUN chmod 744 ${repos_dir}/functest/docker/start.sh \ No newline at end of file
diff --git a/testcases/config_functest.py b/testcases/config_functest.py
index 507e24696..c509d3d12 100755
--- a/testcases/config_functest.py
+++ b/testcases/config_functest.py
@@ -89,13 +89,6 @@ def action_start():
logger.debug("Cleaning possible functest environment leftovers.")
action_clean()
-
- logger.info("Installing ODL environment...")
- if not install_odl():
- logger.error("There has been a problem while installing Robot.")
- action_clean()
- exit(-1)
-
logger.info("Starting installation of functest environment")
logger.info("Installing Rally...")
if not install_rally():
@@ -308,16 +301,6 @@ def check_rally():
return False
-def install_odl():
- cmd = "chmod +x " + ODL_DIR + "start_tests.sh"
- functest_utils.execute_command(cmd,logger)
- cmd = "chmod +x " + ODL_DIR + "create_venv.sh"
- functest_utils.execute_command(cmd,logger)
- cmd = ODL_DIR + "create_venv.sh"
- functest_utils.execute_command(cmd,logger)
- return True
-
-
def create_glance_image(path,name,disk_format):
"""