opendev/system-config
Code Issues Proposed changes

Merge "Reflect zuul window in status page."

Browse Source
This commit is contained in:
Jenkins 2014-01-24 01:13:17 +00:00 committed by Gerrit Code Review
commit d99d1442c4
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
modules/openstack_project/files/zuul/grey.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 364 B

4
modules/openstack_project/files/zuul/status.js
View File

@ -226,7 +226,9 @@ function format_change(change, change_queue) {
} }
html += '<td class="'+cls+'">'; html += '<td class="'+cls+'">';
if (i == change['_tree_index']) { if (i == change['_tree_index']) {
if (change['failing_reasons'] && change['failing_reasons'].length > 0) { if (change['active'] != true) {
html += '<img src="grey.png" title="Waiting until closer to head of queue to start jobs"/>';
} else if (change['failing_reasons'] && change['failing_reasons'].length > 0) {
var reason = change['failing_reasons'].join(', '); var reason = change['failing_reasons'].join(', ');
var image = 'red.png'; var image = 'red.png';
if (reason.match(/merge conflict/)) { if (reason.match(/merge conflict/)) {

6
modules/openstack_project/manifests/status.pp
View File

@ -186,6 +186,12 @@ class openstack_project::status (
require => File['/srv/static/status/zuul'], require => File['/srv/static/status/zuul'],
} }
file { '/srv/static/status/zuul/grey.png':
ensure => present,
source => 'puppet:///modules/openstack_project/zuul/grey.png',
require => File['/srv/static/status/zuul'],
}
file { '/srv/static/status/zuul/line-angle.png': file { '/srv/static/status/zuul/line-angle.png':
ensure => present, ensure => present,
source => 'puppet:///modules/openstack_project/zuul/line-angle.png', source => 'puppet:///modules/openstack_project/zuul/line-angle.png',