zuul
/
zuul
Code Issues Proposed changes

Merge "Fix LOG_PATH to use 7char uuid"

This commit is contained in:
Jenkins 2014-07-03 21:40:40 +00:00 committed by Gerrit Code Review
parent a081ea5f7c 76dee53d35
commit 9aa26bf556
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/test_scheduler.py
View File

@ -2700,7 +2700,7 @@ For CI problems and help debugging, contact ci@example.org"""
self.assertEqual(
"https://storage.example.org/V1/AUTH_account/merge_logs/1/1/1/"
"gate/test-merge/",
self.builds[0].parameters['SWIFT_logs_URL'][:-32])
self.builds[0].parameters['SWIFT_logs_URL'][:-7])
self.assertEqual(5,
len(self.builds[0].parameters['SWIFT_logs_HMAC_BODY'].
split('\n')))
@ -2709,7 +2709,7 @@ For CI problems and help debugging, contact ci@example.org"""
self.assertEqual(
"https://storage.example.org/V1/AUTH_account/logs/1/1/1/"
"gate/test-test/",
self.builds[1].parameters['SWIFT_logs_URL'][:-32])
self.builds[1].parameters['SWIFT_logs_URL'][:-7])
self.assertEqual(5,
len(self.builds[1].parameters['SWIFT_logs_HMAC_BODY'].
split('\n')))
@ -2718,7 +2718,7 @@ For CI problems and help debugging, contact ci@example.org"""
self.assertEqual(
"https://storage.example.org/V1/AUTH_account/stash/1/1/1/"
"gate/test-test/",
self.builds[1].parameters['SWIFT_MOSTLY_URL'][:-32])
self.builds[1].parameters['SWIFT_MOSTLY_URL'][:-7])
self.assertEqual(5,
len(self.builds[1].
parameters['SWIFT_MOSTLY_HMAC_BODY'].split('\n')))

2
zuul/launcher/gearman.py
View File

@ -302,7 +302,7 @@ class Gearman(object):
# The destination_path is a unqiue path for this build request
# and generally where the logs are expected to be placed
destination_path = os.path.join(item.change.getBasePath(),
pipeline.name, job.name, uuid)
pipeline.name, job.name, uuid[:7])
params['BASE_LOG_PATH'] = item.change.getBasePath()
params['LOG_PATH'] = destination_path