[ARVADOS] updated: 7cdfe579a8ad314cf303a280b0de68b026244748

[Git user]

Summary of changes:
 sdk/cwl/arvados_cwl/arvjob.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

       via  7cdfe579a8ad314cf303a280b0de68b026244748 (commit)
      from  f8f8b9030fd63fd6ccc10d02cd2e4cba6ea685b8 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 7cdfe579a8ad314cf303a280b0de68b026244748
Author: Lucas Di Pentima <lucas at curoverse.com>
Date:   Mon Jun 5 10:43:07 2017 -0300

    11557: Don't assume log, output and components are always present on a job record.
    This was causing some tests to fail.
    
    Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas at curoverse.com>

diff --git a/sdk/cwl/arvados_cwl/arvjob.py b/sdk/cwl/arvados_cwl/arvjob.py
index c3eb919..a620a20 100644
--- a/sdk/cwl/arvados_cwl/arvjob.py
+++ b/sdk/cwl/arvados_cwl/arvjob.py
@@ -293,7 +293,8 @@ class RunnerJob(Runner):
 
         if self.enable_reuse:
             # When reusing jobs, copy its output/log collection to the desired project
-            reused_collections = [('Output', job['output']), ('Log', job['log'])]
+            reused_collections = [('Output', job.get('output', None)),
+                                  ('Log', job.get('log', None))]
             for col_type, pdh in [(n, p) for n, p in reused_collections if p]:
                 c = arvados.collection.Collection(pdh,
                                                   api_client=self.arvrunner.api,
@@ -307,7 +308,7 @@ class RunnerJob(Runner):
                             col_type.lower(),
                             c.manifest_locator())
             # Give read permission to the desired project on reused jobs
-            for job_name, job_uuid in job['components'].items():
+            for job_name, job_uuid in job.get('components', {}).items():
                 self.arvrunner.api.links().create(body={
                     'link_class': 'can_read',
                     'tail_uuid': self.arvrunner.project_uuid,

-----------------------------------------------------------------------


hooks/post-receive
--