X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Ftools%2Fpresentation%2Finput_data_files.py;h=63f91972e526ab75b8843d1818d94da41b296193;hp=d4cc8c64e6f2478fc770d00868d7df048db307ac;hb=353c822cb93de90513bc8f380939e8846ac5f65d;hpb=82a13664db8e18e12ccff542e24e5a0dbe2fbce4 diff --git a/resources/tools/presentation/input_data_files.py b/resources/tools/presentation/input_data_files.py index d4cc8c64e6..63f91972e5 100644 --- a/resources/tools/presentation/input_data_files.py +++ b/resources/tools/presentation/input_data_files.py @@ -282,25 +282,25 @@ def download_and_unzip_data_file(spec, job, build, pid): xml_file.write(file_content) break - if not success: - # Try to download .zip from jenkins.fd.io - file_name = spec.input[u"zip-file-name"] - download_path = spec.input[u"zip-download-path"] - if job.startswith(u"csit-"): - url = spec.environment[u"urls"][u"URL[JENKINS,CSIT]"] - else: - raise PresentationError(f"No url defined for the job {job}.") - - full_name = download_path.format( - job=job, build=build[u"build"], filename=file_name - ) - url = u"{0}/{1}".format(url, full_name) - new_name = join( - spec.environment[u"paths"][u"DIR[WORKING,DATA]"], - f"{job}{SEPARATOR}{build[u'build']}{SEPARATOR}{file_name}" - ) - logging.info(f"Downloading {url}") - success, downloaded_name = _download_file(url, new_name) + # if not success: + # # Try to download .zip from jenkins.fd.io + # file_name = spec.input[u"zip-file-name"] + # download_path = spec.input[u"zip-download-path"] + # if job.startswith(u"csit-"): + # url = spec.environment[u"urls"][u"URL[JENKINS,CSIT]"] + # else: + # raise PresentationError(f"No url defined for the job {job}.") + # + # full_name = download_path.format( + # job=job, build=build[u"build"], filename=file_name + # ) + # url = u"{0}/{1}".format(url, full_name) + # new_name = join( + # spec.environment[u"paths"][u"DIR[WORKING,DATA]"], + # f"{job}{SEPARATOR}{build[u'build']}{SEPARATOR}{file_name}" + # ) + # logging.info(f"Downloading {url}") + # success, downloaded_name = _download_file(url, new_name) if success and downloaded_name.endswith(u".zip"): if not is_zipfile(downloaded_name):