summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Hesketh <josh@nitrotech.org>2014-01-30 16:34:36 +1100
committerJoshua Hesketh <josh@nitrotech.org>2014-01-30 16:37:06 +1100
commit9900554992c1690b491d0d88a9e27db013e0d95d (patch)
tree40b687fd6ca2e60279706e693c3b7dd2d3e4df71
parent48de067f62e379370e6163cbac268cc70df07738 (diff)
downloadturbo-hipster-9900554992c1690b491d0d88a9e27db013e0d95d.tar.gz
set the results_set_name to the filepath
Change-Id: I320b103a8957bcd74b1aea1e61722f9ed04e72a2
-rw-r--r--turbo_hipster/lib/models.py12
1 files changed, 8 insertions, 4 deletions
diff --git a/turbo_hipster/lib/models.py b/turbo_hipster/lib/models.py
index 2a28b45..3424e86 100644
--- a/turbo_hipster/lib/models.py
+++ b/turbo_hipster/lib/models.py
@@ -152,11 +152,14 @@ class ShellTask(Task):
@common.task_step
def _prep_working_dir(self):
+ self.job_identifier = utils.determine_job_identifier(
+ self.job_arguments,
+ self.plugin_config['function'],
+ self.job.unique
+ )
self.job_working_dir = os.path.join(
self.global_config['jobs_working_dir'],
- utils.determine_job_identifier(self.job_arguments,
- self.plugin_config['function'],
- self.job.unique)
+ self.job_identifier
)
self.shell_output_log = os.path.join(
self.job_working_dir,
@@ -220,7 +223,7 @@ class ShellTask(Task):
self.log.debug("Process the resulting files (upload/push)")
if 'publish_logs' in self.global_config:
- index_url = utils.push_file(self.shell_output_log,
+ index_url = utils.push_file(self.job_identifier,
self.job_working_dir,
self.global_config['publish_logs'])
self.log.debug("Index URL found at %s" % index_url)
@@ -229,3 +232,4 @@ class ShellTask(Task):
if 'ZUUL_EXTRA_SWIFT_URL' in self.job_arguments:
# Upload to zuul's url as instructed
utils.zuul_swift_upload(self.job_working_dir, self.job_arguments)
+ self.work_data['url'] = self.job_identifier