From d8d7ced6d465d8b7ae6798b2ff7757437e0507c7 Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Fri, 11 Sep 2015 02:10:04 +0200 Subject: reproducible: drop notify from live_status columns --- bin/reproducible_html_live_status.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/reproducible_html_live_status.py b/bin/reproducible_html_live_status.py index 4b4254d1..d73b047d 100755 --- a/bin/reproducible_html_live_status.py +++ b/bin/reproducible_html_live_status.py @@ -42,7 +42,7 @@ def generate_schedule(arch): def generate_live_status_table(arch): query = 'SELECT s.id, s.suite, s.architecture, s.name, s.version, ' + \ - 'p.date_build_started, r.status, r.build_duration, p.builder, p.notify ' + \ + 'p.date_build_started, r.status, r.build_duration, p.builder ' + \ 'FROM sources AS s JOIN schedule AS p ON p.package_id=s.id LEFT JOIN results AS r ON s.id=r.package_id ' + \ 'WHERE (p.date_build_started != "" OR p.notify != "") AND s.architecture="{arch}" ' + \ 'ORDER BY p.date_build_started DESC' @@ -52,14 +52,14 @@ def generate_live_status_table(arch): html += '#src pkg idsuitearch' html += 'nameversion' html += 'build startedprevious build status' - html += 'previous build durationbuilder jobnotify' + html += 'previous build durationbuilder job' html += '\n' counter = 0 for row in rows: counter += 1 # the numbers 16 and 7 should really be derived from /var/lib/jenkins/jobs/reproducible_builder_${arch}_* instead of being hard-coded here... if ( arch == 'amd64' and counter == 16 ) or ( arch == 'armhf' and counter == 7 ): - html += 'There are more builds marked as currently building in the database than there are ' + arch + ' build jobs. This does not compute. Please cleanup and please automate cleanup.' + html += 'There are more builds marked as currently building in the database than there are ' + arch + ' build jobs. This does not compute. Please cleanup and please automate cleanup.' suite = row[1] arch = row[2] pkg = row[3] @@ -68,7 +68,7 @@ def generate_live_status_table(arch): html += '' + link_package(pkg, suite, arch) + '' html += '' + str(row[4]) + '' + str(row[5]) + '' html += '' + str(row[6]) + '' + str(row[7]) + ' ' - html += '' + str(row[8]) + '' + str(row[9]) + '' + html += '' + str(row[8]) + '' html += '\n' html += '

\n' return html -- cgit v1.2.3-70-g09d2