diff options
| author |   jose.lausuch <jose.lausuch@ericsson.com> | 2015-05-26 13:35:58 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2015-05-26 13:35:58 +0000 |
| commit | 0b10079d8e6796e4909e461548850dc9d15c8326 (patch) | |
| tree | 5ab4f8d22731f56404176b47a1d137b1f93a18d7 /testcases/VIM/OpenStack/CI | |
| parent | 9241dfc62fb0603ee865a944db78b4890c850d6d (diff) | |
| parent | d8604ff3fddf2f1ae87d5ece324e8cee281f9679 (diff) | |
Merge "Refactor functest environment. Bugfixes: arg dependencies"
Diffstat (limited to 'testcases/VIM/OpenStack/CI')
| -rw-r--r-- | testcases/VIM/OpenStack/CI/libraries/run_rally.py | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/testcases/VIM/OpenStack/CI/libraries/run_rally.py b/testcases/VIM/OpenStack/CI/libraries/run_rally.py index a1f46e5ba..5e6789c60 100644 --- a/testcases/VIM/OpenStack/CI/libraries/run_rally.py +++ b/testcases/VIM/OpenStack/CI/libraries/run_rally.py @@ -10,18 +10,12 @@ # import re, json, os, urllib2, argparse, logging, yaml -HOME = os.environ['HOME']+"/" -with open(args.repo_path+"testcases/config_functest.yaml") as f: - functest_yaml = yaml.safe_load(f) -f.close() + """ get the date """ cmd = os.popen("date '+%d%m%Y_%H%M'") test_date = cmd.read().rstrip() -HOME = os.environ['HOME']+"/" -SCENARIOS_DIR = HOME + functest_yaml.get("general").get("directories").get("dir_rally_scn") -RESULTS_DIR = HOME + functest_yaml.get("general").get("directories").get("dir_rally_res") + test_date + "/" """ tests configuration """ tests = ['authenticate', 'glance', 'cinder', 'heat', 'keystone', 'neutron', 'nova', 'quotas', 'requests', 'vm', 'tempest', 'all', 'smoke'] @@ -55,6 +49,17 @@ formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(messag ch.setFormatter(formatter) logger.addHandler(ch) +HOME = os.environ['HOME']+"/" +with open(args.repo_path+"testcases/config_functest.yaml") as f: + functest_yaml = yaml.safe_load(f) +f.close() + +HOME = os.environ['HOME']+"/" +SCENARIOS_DIR = HOME + functest_yaml.get("general").get("directories").get("dir_rally_scn") +RESULTS_DIR = HOME + functest_yaml.get("general").get("directories").get("dir_rally_res") + test_date + "/" + + + def get_tempest_id(cmd_raw): """ |