From 299e6d58a5d8acdc57ff2ff2725a9936bb27d168 Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Mon, 5 Oct 2015 13:14:57 +0200 Subject: 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(-) (limited to 'hosts') 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 ed189f1e..f59969b0 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 ed189f1e..f59969b0 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 ed189f1e..f59969b0 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 ed189f1e..f59969b0 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 ed189f1e..f59969b0 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 ed189f1e..f59969b0 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 -- cgit v1.2.3-54-g00ecf