X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Ftools%2Fpresentation%2Finput_data_files.py;h=262c6a0a63bb228a498ea3e2a58907018c75a174;hp=cde6d1acc404083e9486c7e013bd7456bb6626d5;hb=9c38db0a5c7721c1193aebc60e9d3c5e3a351310;hpb=372eab0eac428149d547b2d6eb2ce43cd0d750f6 diff --git a/resources/tools/presentation/input_data_files.py b/resources/tools/presentation/input_data_files.py index cde6d1acc4..262c6a0a63 100644 --- a/resources/tools/presentation/input_data_files.py +++ b/resources/tools/presentation/input_data_files.py @@ -166,17 +166,21 @@ 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]"].format(release=job[-4:]) 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) - url = "{0}/{1}".format(url, full_name) + if not job.startswith("intel-dnv-"): + 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)) + # Download the file from the defined source (Jenkins, logs.fd.io): success = _download_file(url, new_name, log)