From 4fac5c41b962bd09ca1ebe353595bdf8c545e15c Mon Sep 17 00:00:00 2001
From: Felix Schmidt <felix.fs.schmidt@bmw.de>
Date: Thu, 23 May 2019 09:13:05 +0200
Subject: [PATCH] Show retry attempts in UI

Currently, it's not visible in the Zuul UI if a job runs for the first
time or had already a retry. This change adds the number of tries to the
job name if the job had a least one retry.

Change-Id: I75f400b7eec1e623045b600a7bd93846a6ac3090
---
 web/src/containers/status/ChangePanel.jsx | 12 ++++++++----
 zuul/model.py                             |  1 +
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/web/src/containers/status/ChangePanel.jsx b/web/src/containers/status/ChangePanel.jsx
index f79f6af23c..667993836d 100644
--- a/web/src/containers/status/ChangePanel.jsx
+++ b/web/src/containers/status/ChangePanel.jsx
@@ -234,21 +234,25 @@ class ChangePanel extends React.Component {
 
   renderJob (job) {
     const { tenant } = this.props
+    let job_name = job.name
+    if (job.tries > 1) {
+      job_name = job_name + ' (' + job.tries + ')'
+    }
     let name = ''
     if (job.result !== null) {
-      name = <a className='zuul-job-name' href={job.report_url}>{job.name}</a>
+      name = <a className='zuul-job-name' href={job.report_url}>{job_name}</a>
     } else if (job.url !== null) {
       let url = job.url
       if (job.url.match('stream/')) {
         const to = (
           tenant.linkPrefix + '/' + job.url
         )
-        name = <Link className='zuul-job-name' to={to}>{job.name}</Link>
+        name = <Link className='zuul-job-name' to={to}>{job_name}</Link>
       } else {
-        name = <a className='zuul-job-name' href={url}>{job.name}</a>
+        name = <a className='zuul-job-name' href={url}>{job_name}</a>
       }
     } else {
-      name = <span className='zuul-job-name'>{job.name}</span>
+      name = <span className='zuul-job-name'>{job_name}</span>
     }
     let resultBar
     let result = job.result ? job.result.toLowerCase() : null
diff --git a/zuul/model.py b/zuul/model.py
index 432104b396..b6c9fbf47d 100644
--- a/zuul/model.py
+++ b/zuul/model.py
@@ -2759,6 +2759,7 @@ class QueueItem(object):
                 'canceled': build.canceled if build else None,
                 'paused': build.paused if build else None,
                 'retry': build.retry if build else None,
+                'tries': self.current_build_set.getTries(job.name),
                 'node_labels': build.node_labels if build else [],
                 'node_name': build.node_name if build else None,
                 'worker': worker,