[Qa-jenkins-scm] [jenkins.debian.net] 02/02: adopt for newer jenkins LTS

[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 43f516696b0a7667c8fd2f2658640971df5c92a4
Author: Holger Levsen <holger at layer-acht.org>
Date:   Wed Sep 2 03:01:54 2015 +0200

    adopt for newer jenkins LTS
---
 hosts/jenkins/etc/munin/plugins/jenkins_builds                 | 2 +-
 hosts/jenkins/etc/munin/plugins/jenkins_builds_results         | 2 +-
 hosts/jenkins/etc/munin/plugins/jenkins_builds_results_summary | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/hosts/jenkins/etc/munin/plugins/jenkins_builds b/hosts/jenkins/etc/munin/plugins/jenkins_builds
index 3010e39..f861b87 100755
--- a/hosts/jenkins/etc/munin/plugins/jenkins_builds
+++ b/hosts/jenkins/etc/munin/plugins/jenkins_builds
@@ -59,6 +59,6 @@ if [ "$1" = "config" ]; then
 fi
 
 for PREFIX in $JOB_PREFIXES ; do
-	NR=$(find /var/lib/jenkins/jobs/$PREFIX*/builds/ -type d -mtime -1 -name "*_*"| wc -l)
+	NR=$(find /var/lib/jenkins/jobs/$PREFIX*/builds/* -type d -mtime -1| wc -l)
 	echo "jenkins_builds_$PREFIX.value $NR" | tee -a $STATEFILE
 done
diff --git a/hosts/jenkins/etc/munin/plugins/jenkins_builds_results b/hosts/jenkins/etc/munin/plugins/jenkins_builds_results
index 596281f..2169aff 100755
--- a/hosts/jenkins/etc/munin/plugins/jenkins_builds_results
+++ b/hosts/jenkins/etc/munin/plugins/jenkins_builds_results
@@ -61,7 +61,7 @@ if [ "$1" = "config" ]; then
 fi
 
 for PREFIX in $JOB_PREFIXES ; do
-	PREFIX_RESULTS=$(for i in /var/lib/jenkins/jobs/${PREFIX}*/builds/*_*/log ; do tail -1 $i 2>/dev/null; echo " \n"; done )
+	PREFIX_RESULTS=$(for i in /var/lib/jenkins/jobs/${PREFIX}*/builds/*/log ; do tail -1 $i 2>/dev/null; echo " \n"; done )
 	for STATE in success unstable failure ; do
 		NR=0
 		if [ "$STATE" = "failure" ] ; then
diff --git a/hosts/jenkins/etc/munin/plugins/jenkins_builds_results_summary b/hosts/jenkins/etc/munin/plugins/jenkins_builds_results_summary
index b4f5b54..8dff6b3 100755
--- a/hosts/jenkins/etc/munin/plugins/jenkins_builds_results_summary
+++ b/hosts/jenkins/etc/munin/plugins/jenkins_builds_results_summary
@@ -57,7 +57,7 @@ if [ "$1" = "config" ]; then
 	exit 0
 fi
 
-RESULTS=$(for i in /var/lib/jenkins/jobs/*/builds/*_*/log ; do tail -1 $i 2>/dev/null; echo " \n"; done )
+RESULTS=$(for i in /var/lib/jenkins/jobs/*/builds/*/log ; do tail -1 $i 2>/dev/null; echo " \n"; done )
 for STATE in success unstable failure ; do
 	NR=0
 	if [ "$STATE" = "failure" ] ; then

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