X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Ftools%2Fpresentation%2Fspecification_parser.py;h=ae566c67fab716f526134ba05f610c8db5ab22a6;hp=b459bd3117de21be3c7d2b1cc2c9ae51ba8f8a02;hb=599386f5a2f1d63f6dac9f2a0be34f4ba486cf57;hpb=81853d468a1ff40b0e03343b73412aff96a46dd0 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]. \