diff options
author | chenjiankun <chenjiankun1@huawei.com> | 2016-09-20 07:47:21 +0000 |
---|---|---|
committer | chenjiankun <chenjiankun1@huawei.com> | 2016-09-20 07:52:08 +0000 |
commit | b5c5476bf5b6e5a38503f43abc5afc5a8a0d151b (patch) | |
tree | cd363e96ba614fbc71647f40a9fa361ad3161a08 | |
parent | a0a65ceb7af1e950dba78c9de6510c9162d4b3d0 (diff) |
Make a black list for yardstick reporting
JIRA: YARDSTICK-353
Change-Id: Ic4821ff279401cc4eb26d172c0b649e9eeb2da48
Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
-rw-r--r-- | utils/test/reporting/yardstick/reporting-status.py | 5 | ||||
-rw-r--r-- | utils/test/reporting/yardstick/reportingConf.py | 1 | ||||
-rw-r--r-- | utils/test/reporting/yardstick/scenarios.py | 20 |
3 files changed, 26 insertions, 0 deletions
diff --git a/utils/test/reporting/yardstick/reporting-status.py b/utils/test/reporting/yardstick/reporting-status.py index 345acef42..60f1523bb 100644 --- a/utils/test/reporting/yardstick/reporting-status.py +++ b/utils/test/reporting/yardstick/reporting-status.py @@ -16,6 +16,7 @@ import yaml import reportingUtils as utils import reportingConf as conf import scenarioResult as sr +from scenarios import config as cf # Logger logger = utils.getLogger("Yardstick-Status") @@ -41,6 +42,10 @@ for version in conf.versions: scenario_results[k] += stable_result[k] scenario_result_criteria = {} + for s in scenario_results.keys(): + if cf.has_key(installer) and cf[installer].has_key(s): + scenario_results.pop(s) + # From each scenarios get results list for s, s_result in scenario_results.items(): logger.info("---------------------------------") diff --git a/utils/test/reporting/yardstick/reportingConf.py b/utils/test/reporting/yardstick/reportingConf.py index 52d999740..2db41f0e1 100644 --- a/utils/test/reporting/yardstick/reportingConf.py +++ b/utils/test/reporting/yardstick/reportingConf.py @@ -22,6 +22,7 @@ LASTEST_TESTS = 4 REPORTING_PATH = "." URL_BASE = 'http://testresults.opnfv.org/test/api/v1/results' +TEST_CONF = "https://git.opnfv.org/cgit/yardstick/plain/tests/ci/report_config.yaml" # LOG_LEVEL = "ERROR" LOG_LEVEL = "INFO" diff --git a/utils/test/reporting/yardstick/scenarios.py b/utils/test/reporting/yardstick/scenarios.py new file mode 100644 index 000000000..590fea2a4 --- /dev/null +++ b/utils/test/reporting/yardstick/scenarios.py @@ -0,0 +1,20 @@ +import yaml +import os +import requests + +import reportingConf as conf + + +response = requests.get(conf.TEST_CONF) +yaml_file = yaml.safe_load(response.text) +reporting = yaml_file.get('reporting') + +config = {} + +for element in reporting: + name = element['name'] + scenarios = element['scenario'] + for s in scenarios: + if not config.has_key(name): + config[name] = {} + config[name][s] = True |