[Qa-jenkins-scm] [jenkins.debian.net] 01/01: reproducible Debian: stop comparing actual+configured builders, dashboard does that already

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch master
in repository jenkins.debian.net.

commit 7a5b1ac385b862437e706ed62a844717073eeee6
Author: Holger Levsen <holger at layer-acht.org>
Date:   Fri Apr 28 17:35:26 2017 +0200

    reproducible Debian: stop comparing actual+configured builders, dashboard does that already
    
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 bin/reproducible_build_service.sh    | 3 +--
 bin/reproducible_html_live_status.py | 6 ------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/bin/reproducible_build_service.sh b/bin/reproducible_build_service.sh
index 4a46d33..f601ec8 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 08fb5a1..ac91e76 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 += '<th class=\"center\">previous build duration</th><th class=\"center\">average build duration</th><th class=\"center\">builder job</th>'
     html += '</tr>\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 += '<tr><td colspan="10">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.</td></tr>'
-        elif builders == 0:
-             html += '<tr><td colspan="10">0 build jobs for ' + arch + ' detected. This does not compute, please investigate and fix the cause.</td></tr>'
         suite = row[1]
         arch = row[2]
         pkg = row[3]

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/qa/jenkins.debian.net.git