aboutsummaryrefslogtreecommitdiffstats
path: root/resources
diff options
context:
space:
mode:
authorTibor Frank <tifrank@cisco.com>2018-04-03 09:50:45 +0200
committerTibor Frank <tifrank@cisco.com>2018-04-03 09:50:45 +0200
commitc0dd501b9c0a5e16c2d8f0e91e664cc9dcc04752 (patch)
treef4e5714f835262f95a0e643fcf56578498c20a82 /resources
parent767e85ad0dcb9bcb9637188062681311fabb3307 (diff)
CSIT Trending: input files
Change-Id: I15d987cd57272c29d463c711fb7049b33b1e0084 Signed-off-by: Tibor Frank <tifrank@cisco.com>
Diffstat (limited to 'resources')
-rw-r--r--resources/tools/presentation/generator_CPTA.py1
-rw-r--r--resources/tools/presentation/input_data_files.py13
-rw-r--r--resources/tools/presentation/specification_CPTA.yaml2
3 files changed, 6 insertions, 10 deletions
diff --git a/resources/tools/presentation/generator_CPTA.py b/resources/tools/presentation/generator_CPTA.py
index 92244c2610..f3a8c010c5 100644
--- a/resources/tools/presentation/generator_CPTA.py
+++ b/resources/tools/presentation/generator_CPTA.py
@@ -426,7 +426,6 @@ def _generate_all_charts(spec, input_data):
# Generate the chart:
period_name = "Daily" if period == 1 else \
"Weekly" if period < 20 else "Monthly"
- # chart["layout"]["title"] = chart["title"].format(period=period_name)
_generate_chart(traces,
chart["layout"],
file_name="{0}-{1}-{2}{3}".format(
diff --git a/resources/tools/presentation/input_data_files.py b/resources/tools/presentation/input_data_files.py
index 439c0d88bd..1923dad965 100644
--- a/resources/tools/presentation/input_data_files.py
+++ b/resources/tools/presentation/input_data_files.py
@@ -81,13 +81,6 @@ def download_data_files(spec):
try:
response = get(url, stream=True)
code = response.status_code
- # temporary workaround, remove when output.log.xml is not needed
- if code != codes["OK"] and \
- spec.input["file-name"].endswith(".gz"):
- url = '.'.join(url.split('.')[:-1]) + ".log.gz"
- response = get(url, stream=True)
- code = response.status_code
-
if code != codes["OK"]:
logging.warning(
"Jenkins: {0}: {1}.".format(code, responses[code]))
@@ -98,7 +91,11 @@ def download_data_files(spec):
nexus_file_name = "{job}{sep}{build}{sep}{name}".\
format(job=job, sep=SEPARATOR, build=build["build"],
name=file_name)
- url = "{url}/rls{release}/{dir}/{file}".\
+ try:
+ release = "rls".format(int(release))
+ except ValueError:
+ pass
+ url = "{url}/{release}/{dir}/{file}".\
format(url=spec.environment["urls"]["URL[NEXUS]"],
release=release,
dir=spec.environment["urls"]["DIR[NEXUS]"],
diff --git a/resources/tools/presentation/specification_CPTA.yaml b/resources/tools/presentation/specification_CPTA.yaml
index 6b5c7fad1f..c67c3916b2 100644
--- a/resources/tools/presentation/specification_CPTA.yaml
+++ b/resources/tools/presentation/specification_CPTA.yaml
@@ -56,7 +56,7 @@
URL[JENKINS,CSIT]: "https://jenkins.fd.io/view/csit/job"
URL[NEXUS,LOG]: "https://logs.fd.io/production/vex-yul-rot-jenkins-1"
URL[NEXUS]: "https://docs.fd.io/csit"
- DIR[NEXUS]: "report/_static/archive"
+ DIR[NEXUS]: "trending/_static/archive"
make-dirs:
# List the directories which are created while preparing the environment.