diff options
| author |   Morgan Richomme <morgan.richomme@orange.com> | 2017-02-14 13:58:21 +0100 |
|---|---|---|
| committer |   Jose Lausuch <jose.lausuch@ericsson.com> | 2017-02-14 22:38:03 +0000 |
| commit | 82d976978545adeb30ea2808f60136798e9f2cc8 (patch) | |
| tree | 2247228175f989380efa08aef158aa4e24436315 /reporting | |
| parent | 44afde12259d551b74cd0a5d66637e53443ad045 (diff) | |
Bug Fix: tranlate build tag into jenkins url
Include HEALTHCHECK Tier in the reporting
Change-Id: I4a5a8aeb7564ca35c9199c7925ac344b43270d87
Signed-off-by: Morgan Richomme <morgan.richomme@orange.com>
Diffstat (limited to 'reporting')
| -rwxr-xr-x | reporting/functest/reporting-status.py | 6 | ||||
| -rw-r--r-- | reporting/functest/testCase.py | 6 | ||||
| -rw-r--r-- | reporting/reporting.yaml | 10 | ||||
| -rw-r--r-- | reporting/utils/reporting_utils.py | 3 |
4 files changed, 18 insertions, 7 deletions
diff --git a/reporting/functest/reporting-status.py b/reporting/functest/reporting-status.py index 158ee59..df56323 100755 --- a/reporting/functest/reporting-status.py +++ b/reporting/functest/reporting-status.py @@ -61,13 +61,13 @@ logger.info("*******************************************") # Retrieve test cases of Tier 1 (smoke) config_tiers = functest_yaml_config.get("tiers") -# we consider Tier 1 (smoke),2 (features) +# we consider Tier 0 (Healthcheck), Tier 1 (smoke),2 (features) # to validate scenarios -# Tier > 4 are not used to validate scenarios but we display the results anyway +# Tier > 2 are not used to validate scenarios but we display the results anyway # tricky thing for the API as some tests are Functest tests # other tests are declared directly in the feature projects for tier in config_tiers: - if tier['order'] > 0 and tier['order'] < 2: + if tier['order'] >= 0 and tier['order'] < 2: for case in tier['testcases']: if case['name'] not in blacklist: testValid.append(tc.TestCase(case['name'], diff --git a/reporting/functest/testCase.py b/reporting/functest/testCase.py index df0874e..22196c8 100644 --- a/reporting/functest/testCase.py +++ b/reporting/functest/testCase.py @@ -43,7 +43,8 @@ class TestCase(object): 'parser': 'Parser', 'connection_check': 'Health (connection)', 'api_check': 'Health (api)', - 'snaps_smoke': 'SNAPS'} + 'snaps_smoke': 'SNAPS', + 'snaps_health_check': 'Health (dhcp)'} try: self.displayName = display_name_matrix[self.name] except: @@ -138,7 +139,8 @@ class TestCase(object): 'parser': 'parser-basics', 'connection_check': 'connection_check', 'api_check': 'api_check', - 'snaps_smoke': 'snaps_smoke' + 'snaps_smoke': 'snaps_smoke', + 'snaps_health_check': 'snaps_health_check' } try: return test_match_matrix[self.name] diff --git a/reporting/reporting.yaml b/reporting/reporting.yaml index 9db0890..2fb6b78 100644 --- a/reporting/reporting.yaml +++ b/reporting/reporting.yaml @@ -36,12 +36,20 @@ functest: - ovno - security_scan - rally_sanity + - healthcheck + - odl_netvirt + - aaa + - cloudify_ims + - orchestra_ims + - juju_epc + - orchestra + - promise max_scenario_criteria: 50 test_conf: https://git.opnfv.org/cgit/functest/plain/functest/ci/testcases.yaml log_level: ERROR jenkins_url: https://build.opnfv.org/ci/view/functest/job/ exclude_noha: False - exclude_virtual: True + exclude_virtual: False yardstick: test_conf: https://git.opnfv.org/cgit/yardstick/plain/tests/ci/report_config.yaml diff --git a/reporting/utils/reporting_utils.py b/reporting/utils/reporting_utils.py index fc5d188..1879fb6 100644 --- a/reporting/utils/reporting_utils.py +++ b/reporting/utils/reporting_utils.py @@ -269,7 +269,8 @@ def getJenkinsUrl(build_tag): url_base = get_config('functest.jenkins_url') try: build_id = [int(s) for s in build_tag.split("-") if s.isdigit()] - url_id = build_tag[8:-(len(build_id) + 3)] + "/" + str(build_id[0]) + url_id = (build_tag[8:-(len(str(build_id[0])) + 1)] + + "/" + str(build_id[0])) jenkins_url = url_base + url_id + "/console" except: print('Impossible to get jenkins url:') |