diff options
Diffstat (limited to 'testcases')
| -rwxr-xr-x | testcases/config_functest.py | 17 | ||||
| -rw-r--r-- | testcases/config_functest.yaml | 11 |
2 files changed, 10 insertions, 18 deletions
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): """ diff --git a/testcases/config_functest.yaml b/testcases/config_functest.yaml index 46fae91ed..92eb769e0 100644 --- a/testcases/config_functest.yaml +++ b/testcases/config_functest.yaml @@ -21,11 +21,20 @@ general: dir_vIMS_data: /home/opnfv/functest/data/vIMS dir_rally_inst: ~/.rally + repositories: + # branch and commit ID to which the repos will be reset (HEAD) + functest_branch: master + functest_commit: latest + releng_branch: master + releng_commit: latest + rally_branch: master + rally_commit: 9a17d8490e7fb4afee2f5629e6db41eabe4bc4d4 + openstack: image_name: functest-img image_url: http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img image_disk_format: qcow2 - rally_stable_commit: 9a17d8490e7fb4afee2f5629e6db41eabe4bc4d4 + #Public network. Optional neutron_public_net_name: net04_ext |