X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Ftools%2Fpresentation%2Finput_data_files.py;h=1923dad96585a5aa7be76d42850be06775d5ed90;hp=439c0d88bd42c3d7ae9e1d4497f336c99325d9f0;hb=c0dd501b9c0a5e16c2d8f0e91e664cc9dcc04752;hpb=767e85ad0dcb9bcb9637188062681311fabb3307 diff --git a/resources/tools/presentation/input_data_files.py b/resources/tools/presentation/input_data_files.py index 439c0d88bd..1923dad965 100644 --- a/resources/tools/presentation/input_data_files.py +++ b/resources/tools/presentation/input_data_files.py @@ -81,13 +81,6 @@ def download_data_files(spec): try: response = get(url, stream=True) code = response.status_code - # temporary workaround, remove when output.log.xml is not needed - if code != codes["OK"] and \ - spec.input["file-name"].endswith(".gz"): - url = '.'.join(url.split('.')[:-1]) + ".log.gz" - response = get(url, stream=True) - code = response.status_code - if code != codes["OK"]: logging.warning( "Jenkins: {0}: {1}.".format(code, responses[code])) @@ -98,7 +91,11 @@ def download_data_files(spec): nexus_file_name = "{job}{sep}{build}{sep}{name}".\ format(job=job, sep=SEPARATOR, build=build["build"], name=file_name) - url = "{url}/rls{release}/{dir}/{file}".\ + try: + release = "rls".format(int(release)) + except ValueError: + pass + url = "{url}/{release}/{dir}/{file}".\ format(url=spec.environment["urls"]["URL[NEXUS]"], release=release, dir=spec.environment["urls"]["DIR[NEXUS]"],