zuul
/
zuul
Code Issues Proposed changes

Merge "Show retry attempts in UI"

This commit is contained in:
Zuul 2019-06-17 21:30:47 +00:00 committed by Gerrit Code Review
parent 217dea0025 4fac5c41b9
commit 20da534830
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
web/src/containers/status/ChangePanel.jsx
View File

@ -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

1
zuul/model.py
View File

@ -2765,6 +2765,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,