X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Ftools%2Fpresentation%2Finput_data_files.py;h=a1ab2432a65d024a46047865dc2ac1e75fddb798;hb=9390233c8b3d9176e020976ecdf44eb99c1f58e3;hp=da745ccdf9b760b2f6cf46709da31f8260f3fbd6;hpb=77175cdd458e9c9fa9020d73d2f0f0c9b6e7eeb6;p=csit.git diff --git a/resources/tools/presentation/input_data_files.py b/resources/tools/presentation/input_data_files.py index da745ccdf9..a1ab2432a6 100644 --- a/resources/tools/presentation/input_data_files.py +++ b/resources/tools/presentation/input_data_files.py @@ -16,7 +16,6 @@ Download all data. """ import re -import logging from os import rename, mkdir from os.path import join @@ -175,21 +174,16 @@ def download_and_unzip_data_file(spec, job, build, pid, log): 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) + 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)) - 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