From b0262cccffca4d2eb51f36cf991d5997eee28f71 Mon Sep 17 00:00:00 2001 From: morganrOL Date: Wed, 6 May 2015 15:23:45 +0200 Subject: [PATCH] change path to create rally forlder and scenarios+results subfolders, change image for vping to Ubuntu JIRA:FUNCTEST-1 Change-Id: Iee26d425626049e36064904064ec7187ce920b0a Signed-off-by: morganrOL --- testcases/config_functest.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/testcases/config_functest.py b/testcases/config_functest.py index 6420ad7c2..1d189a78c 100644 --- a/testcases/config_functest.py +++ b/testcases/config_functest.py @@ -15,12 +15,13 @@ actions = ['start', 'check', 'clean'] """ global variables """ functest_dir = os.environ['HOME'] + '/.functest/' -#image_url = 'http://mirror.us.leaseweb.net/ubuntu-releases/14.04.2/ubuntu-14.04.2-server-amd64.iso' -image_url = 'http://download.cirros-cloud.net/0.3.0/cirros-0.3.0-i386-disk.img' +image_url = 'https://cloud-images.ubuntu.com/trusty/current/trusty-server-cloudimg-amd64-disk1.img' +#image_url = 'http://download.cirros-cloud.net/0.3.0/cirros-0.3.0-i386-disk.img' image_disk_format = 'raw' image_name = image_url.rsplit('/')[-1] image_path = functest_dir + image_name rally_repo_dir = functest_dir + "Rally_repo/" +rally_test_dir = functest_dir + "Rally_test/" rally_installation_dir = os.environ['HOME'] + "/.rally" @@ -237,7 +238,7 @@ def check_credentials(): def download_tests(): vPing_dir = functest_dir + "vPing/" odl_dir = functest_dir + "ODL/" - bench_tests_dir = functest_dir + "scenarios/" + bench_tests_dir = rally_test_dir + "scenarios/" os.makedirs(vPing_dir) os.makedirs(odl_dir) @@ -254,7 +255,7 @@ def download_tests(): logger.info("Downloading Rally bench tests...") run_rally_url = 'https://git.opnfv.org/cgit/functest/plain/testcases/VIM/OpenStack/CI/libraries/run_rally.py' - if not download_url(run_rally_url,bench_tests_dir ): + if not download_url(run_rally_url,rally_test_dir ): return False rally_bench_base_url = 'https://git.opnfv.org/cgit/functest/plain/testcases/VIM/OpenStack/CI/suites/' -- 2.16.6