diff options
| author |   Peter Wilmott <p@p8952.info> | 2015-04-14 09:30:21 +0100 |
|---|---|---|
| committer | Peter Wilmott <p@p8952.info> | 2015-04-14 09:30:21 +0100 |
| commit | 38929227af5954813cb960fd478ca6971b584588 (patch) | |
| tree | 748dffc604e115f5dcec4f8bc2fac8ad96dfd540 | |
| parent | Correct repoman.sh to work better when the next target is unknown; Rubocop st... (diff) | |
| download | ruby-tinderbox-38929227af5954813cb960fd478ca6971b584588.tar.gz ruby-tinderbox-38929227af5954813cb960fd478ca6971b584588.tar.bz2 ruby-tinderbox-38929227af5954813cb960fd478ca6971b584588.zip | |
Populate CI Next column with build data
| -rw-r--r-- | web/app.rb | 5 | ||||
| -rw-r--r-- | web/views/bumps/new_targets.erb | 4 | ||||
| -rw-r--r-- | web/views/repoman/repoman_checks.erb | 2 |
3 files changed, 7 insertions, 4 deletions
@@ -86,6 +86,9 @@ class RubyTinderbox < Sinatra::Base build_current = package.build_dataset.where(target: 'current').reverse_order(:timestamp).first next if build_current.nil? + build_next = package.build_dataset.where(target: 'next').reverse_order(:timestamp).first + next if build_next.nil? + repoman_current = package.repoman_dataset.where(target: 'current').reverse_order(:timestamp).first next if repoman_current.nil? @@ -93,7 +96,7 @@ class RubyTinderbox < Sinatra::Base next if repoman_next.nil? if repoman_current[:result] == 'passed' && repoman_next[:result] == 'passed' - packages << [package, build_current, nil, repoman_current, repoman_next] + packages << [package, build_current, build_next, repoman_current, repoman_next] end end packages = packages.compact.sort_by { |package| package[0][:identifier] } diff --git a/web/views/bumps/new_targets.erb b/web/views/bumps/new_targets.erb index 305e849..d5a605b 100644 --- a/web/views/bumps/new_targets.erb +++ b/web/views/bumps/new_targets.erb @@ -34,8 +34,8 @@ <td class="width-12 <%=package[1][:result]%>"> <%=package[1][:result].camelcase%> </td> - <td class="width-12"> - ToDo + <td class="width-12 <%=package[2][:result]%>"> + <%=package[2][:result].camelcase%> </td> <td class="width-12 <%=package[3][:result]%>"> <%=package[3][:result].camelcase%> diff --git a/web/views/repoman/repoman_checks.erb b/web/views/repoman/repoman_checks.erb index 77be750..9a14a89 100644 --- a/web/views/repoman/repoman_checks.erb +++ b/web/views/repoman/repoman_checks.erb @@ -38,7 +38,7 @@ <a href="/repoman_logs/<%=repoman.package[:sha1]%>/<%=repoman[:timestamp]%>"><%=repoman[:result].camelcase%></a> </td> <td class="width-17"> - <a href="/repoman_history/<%=repoman.package[:sha1]%>"><%=repoman.package.repoman_dataset.where(target: 'current').count%> Checks(s)</a> + <a href="/repoman_history/<%=repoman.package[:sha1]%>"><%=repoman.package.repoman_dataset.where(target: 'current').count%> Check(s)</a> </td> <td style="display:none;"> +<%=repoman.package[:amd64_keyword]%> |