From 7a5b1ac385b862437e706ed62a844717073eeee6 Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Fri, 28 Apr 2017 17:35:26 +0200 Subject: reproducible Debian: stop comparing actual+configured builders, dashboard does that already Signed-off-by: Holger Levsen --- bin/reproducible_build_service.sh | 3 +-- bin/reproducible_html_live_status.py | 6 ------ 2 files changed, 1 insertion(+), 8 deletions(-) (limited to 'bin') diff --git a/bin/reproducible_build_service.sh b/bin/reproducible_build_service.sh index 4a46d332..f601ec82 100755 --- a/bin/reproducible_build_service.sh +++ b/bin/reproducible_build_service.sh @@ -268,6 +268,5 @@ done # - add support for disabling archs and for shutdown+respan of workers # - add support for starting/stopping workers for specific archs # * more jenkins jobs related: -# -_html_live_status.py counts /var/lib/jenkins/jobs/reproducible_builder_… -# - maintenance job does cleanup there +# - maintenance job does cleanup of /var/lib/jenkins/jobs/reproducible_builder*/ too # * document the new setup in README diff --git a/bin/reproducible_html_live_status.py b/bin/reproducible_html_live_status.py index 08fb5a15..ac91e767 100755 --- a/bin/reproducible_html_live_status.py +++ b/bin/reproducible_html_live_status.py @@ -137,14 +137,8 @@ def generate_live_status_table(arch): html += 'previous build durationaverage build durationbuilder job' html += '\n' counter = 0 - # the path should probably not be hard coded here… - builders = len(glob.glob('/var/lib/jenkins/jobs/reproducible_builder_' + arch + '_*')) for row in rows: counter += 1 - if counter > builders: - html += 'There are more builds marked as currently building in the database (' + str(counter) + ') than there are ' + arch + ' build jobs (' + str(builders) + '). This does not compute, please investigate and fix the cause.' - elif builders == 0: - html += '0 build jobs for ' + arch + ' detected. This does not compute, please investigate and fix the cause.' suite = row[1] arch = row[2] pkg = row[3] -- cgit v1.2.3-70-g09d2