summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2017-04-27 14:55:18 +0200
committerHolger Levsen <holger@layer-acht.org>2017-04-27 14:55:18 +0200
commit2d0d856dfab4b2225d8bc3f3b5416dea339f9eb1 (patch)
tree1f07d4a14846776822f2c3b8fe0429312e33f915 /bin
parent527b6e3b57483ad4a1ae9d854d9b449e8e578a3d (diff)
downloadjenkins.debian.net-2d0d856dfab4b2225d8bc3f3b5416dea339f9eb1.tar.xz
reproducible Debian dashboard: count service jobs not jenkins jobs
Signed-off-by: Holger Levsen <holger@layer-acht.org>
Diffstat (limited to 'bin')
-rwxr-xr-xbin/reproducible_build_service.sh1
-rwxr-xr-xbin/reproducible_html_dashboard.sh2
2 files changed, 1 insertions, 2 deletions
diff --git a/bin/reproducible_build_service.sh b/bin/reproducible_build_service.sh
index 390db7e3..17d736f1 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 7f4b0804..53f78d87 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