[Qa-jenkins-scm] [jenkins.debian.net] 01/01: reproducible: fix munin graphs to count correctly

[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 299e6d58a5d8acdc57ff2ff2725a9936bb27d168
Author: Holger Levsen <holger at layer-acht.org>
Date:   Mon Oct 5 13:14:57 2015 +0200

    reproducible: fix munin graphs to count correctly
---
 hosts/bpi0-armhf-rb/etc/munin/plugins/jenkins_reproducible_builds     | 4 ++--
 .../cbxi4pro0-armhf-rb/etc/munin/plugins/jenkins_reproducible_builds  | 4 ++--
 hosts/hb0-armhf-rb/etc/munin/plugins/jenkins_reproducible_builds      | 4 ++--
 .../etc/munin/plugins/jenkins_reproducible_builds                     | 4 ++--
 .../etc/munin/plugins/jenkins_reproducible_builds                     | 4 ++--
 hosts/wbq0-armhf-rb/etc/munin/plugins/jenkins_reproducible_builds     | 4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/hosts/bpi0-armhf-rb/etc/munin/plugins/jenkins_reproducible_builds b/hosts/bpi0-armhf-rb/etc/munin/plugins/jenkins_reproducible_builds
index ed189f1..f59969b 100755
--- a/hosts/bpi0-armhf-rb/etc/munin/plugins/jenkins_reproducible_builds
+++ b/hosts/bpi0-armhf-rb/etc/munin/plugins/jenkins_reproducible_builds
@@ -48,9 +48,9 @@ fi
 
 for PREFIX in $JOB_PREFIXES ; do
 	if [ "$PREFIX" = "first" ] ; then
-		NR=$(ps fax | grep -c "bin/bash /srv/jenkins/bin/reproducible_build.sh 1")
+		NR=$(ps fax | grep -v grep | grep -c "bin/bash /srv/jenkins/bin/reproducible_build.sh 1")
 	else
-		NR=$(ps fax | grep -c "bin/bash /srv/jenkins/bin/reproducible_build.sh 2")
+		NR=$(ps fax | grep -v grep | grep -c "bin/bash /srv/jenkins/bin/reproducible_build.sh 2")
 	fi
 	echo "jenkins_reproducible_${PREFIX}_build.value $NR"
 	done
diff --git a/hosts/cbxi4pro0-armhf-rb/etc/munin/plugins/jenkins_reproducible_builds b/hosts/cbxi4pro0-armhf-rb/etc/munin/plugins/jenkins_reproducible_builds
index ed189f1..f59969b 100755
--- a/hosts/cbxi4pro0-armhf-rb/etc/munin/plugins/jenkins_reproducible_builds
+++ b/hosts/cbxi4pro0-armhf-rb/etc/munin/plugins/jenkins_reproducible_builds
@@ -48,9 +48,9 @@ fi
 
 for PREFIX in $JOB_PREFIXES ; do
 	if [ "$PREFIX" = "first" ] ; then
-		NR=$(ps fax | grep -c "bin/bash /srv/jenkins/bin/reproducible_build.sh 1")
+		NR=$(ps fax | grep -v grep | grep -c "bin/bash /srv/jenkins/bin/reproducible_build.sh 1")
 	else
-		NR=$(ps fax | grep -c "bin/bash /srv/jenkins/bin/reproducible_build.sh 2")
+		NR=$(ps fax | grep -v grep | grep -c "bin/bash /srv/jenkins/bin/reproducible_build.sh 2")
 	fi
 	echo "jenkins_reproducible_${PREFIX}_build.value $NR"
 	done
diff --git a/hosts/hb0-armhf-rb/etc/munin/plugins/jenkins_reproducible_builds b/hosts/hb0-armhf-rb/etc/munin/plugins/jenkins_reproducible_builds
index ed189f1..f59969b 100755
--- a/hosts/hb0-armhf-rb/etc/munin/plugins/jenkins_reproducible_builds
+++ b/hosts/hb0-armhf-rb/etc/munin/plugins/jenkins_reproducible_builds
@@ -48,9 +48,9 @@ fi
 
 for PREFIX in $JOB_PREFIXES ; do
 	if [ "$PREFIX" = "first" ] ; then
-		NR=$(ps fax | grep -c "bin/bash /srv/jenkins/bin/reproducible_build.sh 1")
+		NR=$(ps fax | grep -v grep | grep -c "bin/bash /srv/jenkins/bin/reproducible_build.sh 1")
 	else
-		NR=$(ps fax | grep -c "bin/bash /srv/jenkins/bin/reproducible_build.sh 2")
+		NR=$(ps fax | grep -v grep | grep -c "bin/bash /srv/jenkins/bin/reproducible_build.sh 2")
 	fi
 	echo "jenkins_reproducible_${PREFIX}_build.value $NR"
 	done
diff --git a/hosts/profitbricks-build1-amd64/etc/munin/plugins/jenkins_reproducible_builds b/hosts/profitbricks-build1-amd64/etc/munin/plugins/jenkins_reproducible_builds
index ed189f1..f59969b 100755
--- a/hosts/profitbricks-build1-amd64/etc/munin/plugins/jenkins_reproducible_builds
+++ b/hosts/profitbricks-build1-amd64/etc/munin/plugins/jenkins_reproducible_builds
@@ -48,9 +48,9 @@ fi
 
 for PREFIX in $JOB_PREFIXES ; do
 	if [ "$PREFIX" = "first" ] ; then
-		NR=$(ps fax | grep -c "bin/bash /srv/jenkins/bin/reproducible_build.sh 1")
+		NR=$(ps fax | grep -v grep | grep -c "bin/bash /srv/jenkins/bin/reproducible_build.sh 1")
 	else
-		NR=$(ps fax | grep -c "bin/bash /srv/jenkins/bin/reproducible_build.sh 2")
+		NR=$(ps fax | grep -v grep | grep -c "bin/bash /srv/jenkins/bin/reproducible_build.sh 2")
 	fi
 	echo "jenkins_reproducible_${PREFIX}_build.value $NR"
 	done
diff --git a/hosts/profitbricks-build2-amd64/etc/munin/plugins/jenkins_reproducible_builds b/hosts/profitbricks-build2-amd64/etc/munin/plugins/jenkins_reproducible_builds
index ed189f1..f59969b 100755
--- a/hosts/profitbricks-build2-amd64/etc/munin/plugins/jenkins_reproducible_builds
+++ b/hosts/profitbricks-build2-amd64/etc/munin/plugins/jenkins_reproducible_builds
@@ -48,9 +48,9 @@ fi
 
 for PREFIX in $JOB_PREFIXES ; do
 	if [ "$PREFIX" = "first" ] ; then
-		NR=$(ps fax | grep -c "bin/bash /srv/jenkins/bin/reproducible_build.sh 1")
+		NR=$(ps fax | grep -v grep | grep -c "bin/bash /srv/jenkins/bin/reproducible_build.sh 1")
 	else
-		NR=$(ps fax | grep -c "bin/bash /srv/jenkins/bin/reproducible_build.sh 2")
+		NR=$(ps fax | grep -v grep | grep -c "bin/bash /srv/jenkins/bin/reproducible_build.sh 2")
 	fi
 	echo "jenkins_reproducible_${PREFIX}_build.value $NR"
 	done
diff --git a/hosts/wbq0-armhf-rb/etc/munin/plugins/jenkins_reproducible_builds b/hosts/wbq0-armhf-rb/etc/munin/plugins/jenkins_reproducible_builds
index ed189f1..f59969b 100755
--- a/hosts/wbq0-armhf-rb/etc/munin/plugins/jenkins_reproducible_builds
+++ b/hosts/wbq0-armhf-rb/etc/munin/plugins/jenkins_reproducible_builds
@@ -48,9 +48,9 @@ fi
 
 for PREFIX in $JOB_PREFIXES ; do
 	if [ "$PREFIX" = "first" ] ; then
-		NR=$(ps fax | grep -c "bin/bash /srv/jenkins/bin/reproducible_build.sh 1")
+		NR=$(ps fax | grep -v grep | grep -c "bin/bash /srv/jenkins/bin/reproducible_build.sh 1")
 	else
-		NR=$(ps fax | grep -c "bin/bash /srv/jenkins/bin/reproducible_build.sh 2")
+		NR=$(ps fax | grep -v grep | grep -c "bin/bash /srv/jenkins/bin/reproducible_build.sh 2")
 	fi
 	echo "jenkins_reproducible_${PREFIX}_build.value $NR"
 	done

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