[ARVADOS] updated: 1.1.2-156-g2517c98

[Git user]

Summary of changes:
 apps/workbench/app/models/pipeline_instance_work_unit.rb | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

       via  2517c98e6835fef0a9e9829773f058d7ced00462 (commit)
      from  948c4e583b89e28730f8a0d2ae3f94e459351b30 (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 2517c98e6835fef0a9e9829773f058d7ced00462
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Thu Feb 8 14:04:37 2018 -0500

    12840: Report pipeline state=Failed on job creation failure.
    
    There's no failed job in this case, because there's no job, but
    a-r-p-i does set components_summary.failed > 0.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>

diff --git a/apps/workbench/app/models/pipeline_instance_work_unit.rb b/apps/workbench/app/models/pipeline_instance_work_unit.rb
index de70689..a9bc9cf 100644
--- a/apps/workbench/app/models/pipeline_instance_work_unit.rb
+++ b/apps/workbench/app/models/pipeline_instance_work_unit.rb
@@ -61,11 +61,14 @@ class PipelineInstanceWorkUnit < ProxyWorkUnit
   end
 
   def state_label
-    # Show "Cancelled" instead of "Failed" if there are no failed
-    # components. #12840
     if get(:state) != "Failed"
       return super
     end
+    if get(:components_summary).andand[:failed].andand > 0
+      return super
+    end
+    # Show "Cancelled" instead of "Failed" if there are no failed
+    # components. #12840
     get(:components).each do |_, c|
       jstate = c[:job][:state] rescue nil
       if jstate == "Failed"

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


hooks/post-receive
--