X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Ftools%2Fpresentation%2Fspecification_parser.py;h=16c69ce18c05e1d4232ed4a1b6e72e81cee5c752;hp=f71c482ec370af603068d90b0a40e45038cccbe5;hb=d68951ac245150eeefa6e0f4156e4c1b5c9e9325;hpb=99607701fe5f09ee1c691257e18a54d4fd17eaf3

diff --git a/resources/tools/presentation/specification_parser.py b/resources/tools/presentation/specification_parser.py
index f71c482ec3..16c69ce18c 100644
--- a/resources/tools/presentation/specification_parser.py
+++ b/resources/tools/presentation/specification_parser.py
@@ -26,7 +26,7 @@ from utils import get_last_successful_build_number
 from utils import get_last_completed_build_number
 
 
-class Specification(object):
+class Specification:
     """Specification of Presentation and analytics layer.
 
     - based on specification specified in the specification YAML file
@@ -370,7 +370,7 @@ class Specification(object):
 
         try:
             self._specification["environment"]["urls"] = \
-                self._replace_tags(self._cfg_yaml[idx]["urls"])
+                self._cfg_yaml[idx]["urls"]
         except KeyError:
             self._specification["environment"]["urls"] = None
 
@@ -425,16 +425,24 @@ 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 <start, build_type>
-                            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:
+                    elif isinstance(builds, list):
+                        for idx, item in enumerate(builds):
+                            try:
+                                builds[idx] = int(item)
+                            except ValueError:
+                                # defined as a range <build_type>
+                                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():
             if isinstance(data_set, list):
                 new_set = dict()
@@ -515,13 +523,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 <start, build_type>
-                            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]. \
@@ -628,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"])):
@@ -635,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}.".