X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Ftools%2Fpresentation%2Finput_data_files.py;h=da745ccdf9b760b2f6cf46709da31f8260f3fbd6;hp=cde6d1acc404083e9486c7e013bd7456bb6626d5;hb=77175cdd458e9c9fa9020d73d2f0f0c9b6e7eeb6;hpb=153bf776309870aa615f8217c3b438aad199f5ed diff --git a/resources/tools/presentation/input_data_files.py b/resources/tools/presentation/input_data_files.py index cde6d1acc4..da745ccdf9 100644 --- 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 logging 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]"] + 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) + 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)) + + logging.info(new_name) + # 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