From d0c80e199ba08cd98aac5bd43c189fdafa35a9e0 Mon Sep 17 00:00:00 2001 From: Joshua Hesketh Date: Thu, 19 Jun 2014 12:45:22 +1000 Subject: [PATCH] Fix the swift destination prefix The destination prefix is given by the calcuated LOG_PATH env variable now that zuul sets a deterministic path for patchsets. Also fix joining the final path variables Change-Id: I6d98b0df8bb87d8ad136a8df0d5bf04d2e27a628 --- .../files/slave_scripts/zuul_swift_upload.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/openstack_project/files/slave_scripts/zuul_swift_upload.py b/modules/openstack_project/files/slave_scripts/zuul_swift_upload.py index 262c82c1f6..3c20d0f856 100755 --- a/modules/openstack_project/files/slave_scripts/zuul_swift_upload.py +++ b/modules/openstack_project/files/slave_scripts/zuul_swift_upload.py @@ -110,8 +110,8 @@ def zuul_swift_upload(file_path, swift_url, swift_hmac_body, swift_signature, swift_form_post_submit(file_list, swift_url, swift_hmac_body, swift_signature) - return (logserver_prefix + swift_destination_prefix + - os.path.basename(index_file)) + return os.path.join(logserver_prefix, swift_destination_prefix, + os.path.basename(index_file)) def grab_args(): @@ -135,7 +135,7 @@ if __name__ == '__main__': os.environ['SWIFT_%s_HMAC_BODY' % args.name], os.environ['SWIFT_%s_SIGNATURE' % args.name], os.environ['SWIFT_%s_LOGSERVER_PREFIX' % args.name], - os.environ['SWIFT_%s_DESTINATION_PREFIX' % args.name] + os.environ['LOG_PATH'] ) print result_url except KeyError as e: