X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Ftools%2Fpresentation%2Fspecification_parser.py;h=9852d905ba71c9083fae17828b1e751a2bd6fe6a;hb=e2d15edc355f0c70df578dde0495f8ffd85d8c12;hp=ae566c67fab716f526134ba05f610c8db5ab22a6;hpb=599386f5a2f1d63f6dac9f2a0be34f4ba486cf57;p=csit.git diff --git a/resources/tools/presentation/specification_parser.py b/resources/tools/presentation/specification_parser.py index ae566c67fa..9852d905ba 100644 --- a/resources/tools/presentation/specification_parser.py +++ b/resources/tools/presentation/specification_parser.py @@ -434,6 +434,13 @@ class Specification(object): 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 + elif isinstance(builds, list): + for idx, item in enumerate(builds): + try: + builds[idx] = int(item) + except ValueError: + # defined as a range + builds[idx] = self._get_build_number(job, item) # Data sets: add sub-sets to sets (only one level): for set_name, data_set in self.configuration["data-sets"].items(): @@ -630,6 +637,11 @@ class Specification(object): if isinstance(data_set, str): element[item]["data"] = \ self.configuration["data-sets"][data_set] + data_set = element[item].get("data-replacement", + None) + if isinstance(data_set, str): + element[item]["data-replacement"] = \ + self.configuration["data-sets"][data_set] if element.get("history", None): for i in range(len(element["history"])): @@ -637,6 +649,11 @@ class Specification(object): if isinstance(data_set, str): element["history"][i]["data"] = \ self.configuration["data-sets"][data_set] + data_set = element["history"][i].get( + "data-replacement", None) + if isinstance(data_set, str): + element["history"][i]["data-replacement"] = \ + self.configuration["data-sets"][data_set] except KeyError: raise PresentationError("Wrong data set used in {0}.".