From 599386f5a2f1d63f6dac9f2a0be34f4ba486cf57 Mon Sep 17 00:00:00 2001 From: Tibor Frank Date: Wed, 6 Feb 2019 08:22:32 +0100 Subject: CSIT-1412: Create trending graphs for svc density - static content - plots Change-Id: If3d77f5415acfa2efe2bc7ca13e426747b027f8e Signed-off-by: Tibor Frank --- resources/tools/presentation/specification_parser.py | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'resources/tools/presentation/specification_parser.py') diff --git a/resources/tools/presentation/specification_parser.py b/resources/tools/presentation/specification_parser.py index b459bd3117..ae566c67fa 100644 --- a/resources/tools/presentation/specification_parser.py +++ b/resources/tools/presentation/specification_parser.py @@ -425,13 +425,14 @@ class Specification(object): for job, builds in data_set.items(): if builds: if isinstance(builds, dict): - build_nr = builds.get("end", None) + build_end = builds.get("end", None) try: - build_nr = int(build_nr) + build_end = int(build_end) except ValueError: # defined as a range - build_nr = self._get_build_number(job, build_nr) - builds = [x for x in range(builds["start"], build_nr+1)] + build_end = self._get_build_number(job, build_end) + builds = [x for x in range(builds["start"], build_end+1) + if x not in builds.get("skip", list())] self.configuration["data-sets"][set_name][job] = builds # Data sets: add sub-sets to sets (only one level): @@ -515,13 +516,14 @@ class Specification(object): for job, builds in self._cfg_yaml[idx]["builds"].items(): if builds: if isinstance(builds, dict): - build_nr = builds.get("end", None) + build_end = builds.get("end", None) try: - build_nr = int(build_nr) + build_end = int(build_end) except ValueError: # defined as a range - build_nr = self._get_build_number(job, build_nr) - builds = [x for x in range(builds["start"], build_nr+1)] + build_end = self._get_build_number(job, build_end) + builds = [x for x in range(builds["start"], build_end+1) + if x not in builds.get("skip", list())] self._specification["input"]["builds"][job] = list() for build in builds: self._specification["input"]["builds"][job]. \ -- cgit 1.2.3-korg