[Qa-jenkins-scm] [jenkins.debian.net] 01/01: reproducible Debian dashboard: count service jobs not jenkins jobs

[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 2d0d856dfab4b2225d8bc3f3b5416dea339f9eb1
Author: Holger Levsen <holger at layer-acht.org>
Date:   Thu Apr 27 14:55:18 2017 +0200

    reproducible Debian dashboard: count service jobs not jenkins jobs
    
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 bin/reproducible_build_service.sh  | 1 -
 bin/reproducible_html_dashboard.sh | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/bin/reproducible_build_service.sh b/bin/reproducible_build_service.sh
index 390db7e..17d736f 100755
--- a/bin/reproducible_build_service.sh
+++ b/bin/reproducible_build_service.sh
@@ -264,7 +264,6 @@ done
 # * maintenance job might want to:
 #   - check for running builds using systemctl show & ps fax
 #   - check if at least one build is running on a build node
-# * dashboard jobs need to count for running jobs in this script…
 # * drop jobs from repro.yaml
 # * use ExecStop to kill remote builds on shutdown
 #   - remove cleanup_nodes.sh once this works
diff --git a/bin/reproducible_html_dashboard.sh b/bin/reproducible_html_dashboard.sh
index 7f4b080..53f78d8 100755
--- a/bin/reproducible_html_dashboard.sh
+++ b/bin/reproducible_html_dashboard.sh
@@ -338,7 +338,7 @@ write_build_performance_stats() {
 	done
 	write_page "</tr><tr><td class=\"left\">Build jobs configured</td>"
 	for ARCH in ${ARCHS} ; do
-		write_page "<td>$(ls /var/lib/jenkins/jobs/reproducible_builder_* -1d|grep -c $ARCH)</td>"
+		write_page "<td>$(grep "MAX=" /srv/jenkins/bin/reproducible_build_service.sh |grep $ARCH|cut -d "=" -f2-|cut -d " " -f1)</td>"
 	done
 	write_page "</tr><tr><td class=\"left\">Build jobs currently running</td>"
 	for ARCH in ${ARCHS} ; do

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