aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--resources/tools/presentation/specification_CPTA.yaml8
-rw-r--r--resources/tools/presentation/specification_parser.py95
-rw-r--r--resources/tools/presentation/utils.py30
3 files changed, 86 insertions, 47 deletions
diff --git a/resources/tools/presentation/specification_CPTA.yaml b/resources/tools/presentation/specification_CPTA.yaml
index 8b5f59ed06..545751c270 100644
--- a/resources/tools/presentation/specification_CPTA.yaml
+++ b/resources/tools/presentation/specification_CPTA.yaml
@@ -75,11 +75,10 @@
type: "configuration"
data-sets:
-# TODO: Specify input data, this is only an example:
plot-performance-trending:
csit-vpp-perf-mrr-daily-master:
start: 9
- end: "lastSuccessfulBuild" # take all from the 'start'
+ end: "lastCompletedBuild" # "lastSuccessfulBuild" # take all from the 'start'
plot-layouts:
plot-cpta:
@@ -189,10 +188,7 @@
builds:
csit-vpp-perf-mrr-daily-master:
start: 9
- end: "lastSuccessfulBuild" # take all from the 'start'
-# csit-vpp-perf-check-master:
-# start: 22
-# end: 22
+ end: "lastCompletedBuild" # take all from the 'start'
-
type: "output"
diff --git a/resources/tools/presentation/specification_parser.py b/resources/tools/presentation/specification_parser.py
index ca9c19c93e..7b7d35bffb 100644
--- a/resources/tools/presentation/specification_parser.py
+++ b/resources/tools/presentation/specification_parser.py
@@ -22,7 +22,8 @@ from yaml import load, YAMLError
from pprint import pformat
from errors import PresentationError
-from utils import get_last_build_number
+from utils import get_last_successful_build_number
+from utils import get_last_completed_build_number
class Specification(object):
@@ -230,6 +231,44 @@ class Specification(object):
raise PresentationError("Job '{}' and build '{}' is not defined in "
"specification file.".format(job, build_nr))
+ def _get_build_number(self, job, build_type):
+ """Get the number of the job defined by its name:
+ - lastSuccessfulBuild
+ - lastCompletedBuild
+
+ :param job: Job name.
+ :param build_type: Build type:
+ - lastSuccessfulBuild
+ - lastCompletedBuild
+ :type job" str
+ :raises PresentationError: If it is not possible to get the build
+ number.
+ :returns: The build number.
+ :rtype: int
+ """
+
+ # defined as a range <start, end>
+ if build_type == "lastSuccessfulBuild":
+ # defined as a range <start, lastSuccessfulBuild>
+ ret_code, build_nr, _ = get_last_successful_build_number(
+ self.environment["urls"]["URL[JENKINS,CSIT]"], job)
+ elif build_type == "lastCompletedBuild":
+ # defined as a range <start, lastCompletedBuild>
+ ret_code, build_nr, _ = get_last_completed_build_number(
+ self.environment["urls"]["URL[JENKINS,CSIT]"], job)
+ else:
+ raise PresentationError("Not supported build type: '{0}'".
+ format(build_type))
+ if ret_code != 0:
+ raise PresentationError("Not possible to get the number of the "
+ "build number.")
+ try:
+ build_nr = int(build_nr)
+ return build_nr
+ except ValueError as err:
+ raise PresentationError("Not possible to get the number of the "
+ "build number.\nReason: {0}".format(err))
+
def _get_type_index(self, item_type):
"""Get index of item type (environment, input, output, ...) in
specification YAML file.
@@ -376,23 +415,14 @@ class Specification(object):
for job, builds in data_set.items():
if builds:
if isinstance(builds, dict):
- # defined as a range <start, end>
- if builds.get("end", None) == "lastSuccessfulBuild":
- # defined as a range <start, lastSuccessfulBuild>
- ret_code, build_nr, _ = get_last_build_number(
- self.environment["urls"]["URL[JENKINS,CSIT]"],
- job)
- if ret_code != 0:
- raise PresentationError(
- "Not possible to get the number of the "
- "last successful build.")
- else:
- # defined as a range <start, end (build number)>
- build_nr = builds.get("end", None)
- builds = [x for x in range(builds["start"],
- int(build_nr)+1)]
+ build_nr = builds.get("end", None)
+ try:
+ build_nr = int(build_nr)
+ 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)]
self.configuration["data-sets"][set_name][job] = builds
-
logging.info("Done.")
def _parse_debug(self):
@@ -452,25 +482,18 @@ class Specification(object):
for job, builds in self._cfg_yaml[idx]["builds"].items():
if builds:
if isinstance(builds, dict):
- # defined as a range <start, end>
- if builds.get("end", None) == "lastSuccessfulBuild":
- # defined as a range <start, lastSuccessfulBuild>
- ret_code, build_nr, _ = get_last_build_number(
- self.environment["urls"]["URL[JENKINS,CSIT]"],
- job)
- if ret_code != 0:
- raise PresentationError(
- "Not possible to get the number of the "
- "last successful build.")
- else:
- # defined as a range <start, end (build number)>
- build_nr = builds.get("end", None)
- builds = [x for x in range(builds["start"],
- int(build_nr) + 1)]
- self._specification["input"]["builds"][job] = list()
- for build in builds:
- self._specification["input"]["builds"][job].\
- append({"build": build, "status": None})
+ build_nr = builds.get("end", None)
+ try:
+ build_nr = int(build_nr)
+ 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)]
+ self._specification["input"]["builds"][job] = list()
+ for build in builds:
+ self._specification["input"]["builds"][job]. \
+ append({"build": build, "status": None})
+
else:
logging.warning("No build is defined for the job '{}'. "
"Trying to continue without it.".
diff --git a/resources/tools/presentation/utils.py b/resources/tools/presentation/utils.py
index 966d7f558b..154b6e9b23 100644
--- a/resources/tools/presentation/utils.py
+++ b/resources/tools/presentation/utils.py
@@ -172,15 +172,35 @@ def execute_command(cmd):
return proc.returncode, stdout, stderr
-def get_last_build_number(jenkins_url, job_name):
+def get_last_successful_build_number(jenkins_url, job_name):
+ """Get the number of the last successful build of the given job.
+
+ :param jenkins_url: Jenkins URL.
+ :param job_name: Job name.
+ :type jenkins_url: str
+ :type job_name: str
+ :returns: The build number as a string.
+ :rtype: str
"""
- :param jenkins_url:
- :param job_name:
- :return:
+ url = "{}/{}/lastSuccessfulBuild/buildNumber".format(jenkins_url, job_name)
+ cmd = "wget -qO- {url}".format(url=url)
+
+ return execute_command(cmd)
+
+
+def get_last_completed_build_number(jenkins_url, job_name):
+ """Get the number of the last completed build of the given job.
+
+ :param jenkins_url: Jenkins URL.
+ :param job_name: Job name.
+ :type jenkins_url: str
+ :type job_name: str
+ :returns: The build number as a string.
+ :rtype: str
"""
- url = "{}/{}/lastSuccessfulBuild/buildNumber".format(jenkins_url, job_name)
+ url = "{}/{}/lastCompletedBuild/buildNumber".format(jenkins_url, job_name)
cmd = "wget -qO- {url}".format(url=url)
return execute_command(cmd)