CSIT-1351: Add Denverton results to report

[csit.git] / resources / tools / presentation / input_data_files.py

diff --git a/resources/tools/presentation/input_data_files.py b/resources/tools/presentation/input_data_files.py
index cde6d1a..da745cc 100644 (file)
--- a/resources/tools/presentation/input_data_files.py
+++ b/resources/tools/presentation/input_data_files.py
@@ -16,6 +16,7 @@ Download all data.
 """
 
 import re
 """
 
 import re

+import logging

 
 from os import rename, mkdir
 from os.path import join
 
 from os import rename, mkdir
 from os.path import join


@@ -166,20 +167,29 @@ def download_and_unzip_data_file(spec, job, build, pid, log):
             return False
     elif job.startswith("hc2vpp-"):
         url = spec.environment["urls"]["URL[JENKINS,HC]"]
             return False
     elif job.startswith("hc2vpp-"):
         url = spec.environment["urls"]["URL[JENKINS,HC]"]

+    elif job.startswith("intel-dnv-"):
+        url = spec.environment["urls"]["URL[VIRL,DNV]"]

     else:
         raise PresentationError("No url defined for the job '{}'.".
                                 format(job))
     file_name = spec.input["file-name"]
     full_name = spec.input["download-path"]. \
         format(job=job, build=build["build"], filename=file_name)
     else:
         raise PresentationError("No url defined for the job '{}'.".
                                 format(job))
     file_name = spec.input["file-name"]
     full_name = spec.input["download-path"]. \
         format(job=job, build=build["build"], filename=file_name)

+    if job.startswith("intel-dnv-"):
+        full_name = ""

     url = "{0}/{1}".format(url, full_name)
     new_name = join(spec.environment["paths"]["DIR[WORKING,DATA]"],
                     "{job}{sep}{build}{sep}{name}".
                     format(job=job, sep=SEPARATOR, build=build["build"],
                            name=file_name))
     url = "{0}/{1}".format(url, full_name)
     new_name = join(spec.environment["paths"]["DIR[WORKING,DATA]"],
                     "{job}{sep}{build}{sep}{name}".
                     format(job=job, sep=SEPARATOR, build=build["build"],
                            name=file_name))

+
+    logging.info(new_name)
+

     # Download the file from the defined source (Jenkins, logs.fd.io):
     success = _download_file(url, new_name, log)
 
     # Download the file from the defined source (Jenkins, logs.fd.io):
     success = _download_file(url, new_name, log)
 

+    logging.info("{}: {}".format(url, success))
+

     if success and new_name.endswith(".zip"):
         if not is_zipfile(new_name):
             success = False
     if success and new_name.endswith(".zip"):
         if not is_zipfile(new_name):
             success = False