diff options
| -rwxr-xr-x | bin/cd_tester.sh | 2 | ||||
| -rwxr-xr-x | etc/munin/plugins/jenkins_builds | 10 | ||||
| -rwxr-xr-x | etc/munin/plugins/jenkins_builds_results | 10 | ||||
| -rwxr-xr-x | etc/munin/plugins/jenkins_jobs | 10 |
4 files changed, 16 insertions, 16 deletions
diff --git a/bin/cd_tester.sh b/bin/cd_tester.sh index 6e2c72fb..54ccd2d2 100755 --- a/bin/cd_tester.sh +++ b/bin/cd_tester.sh @@ -63,7 +63,7 @@ bootstrap() { case $NAME in debian-edu-wheezy) echo "fire up qemu now..." - sudo qemu-system-x86_64 -cdrom $IMAGE -hda $NAME.qcow -boot d -m 1024 -display vnc=localhost:$DISPLAY --kernel $IMAGE_MNT/install.amd/vmlinuz --append "auto=true priority=critical url=http://10.0.2.2/userContent/$NAME-preseed.cfg video=vesa:ywrap,mtrr vga=788 initrd=/install.amd/gtk/initrd.gz -- quiet" --initrd $IMAGE_MNT/install.amd/gtk/initrd.gz & + sudo qemu-system-x86_64 -cdrom $IMAGE -hda $NAME.qcow -boot d -m 1024 -display vnc=localhost:$DISPLAY --kernel $IMAGE_MNT/install.amd/vmlinuz --append "auto=true priority=critical url=http://10.0.2.2/userContent/$NAME-preseed.cfg video=vesa:ywrap,mtrr vga=788 acpi=off initrd=/install.amd/gtk/initrd.gz -- quiet" --initrd $IMAGE_MNT/install.amd/gtk/initrd.gz & ;; *) echo "unsupported distro." exit 1 diff --git a/etc/munin/plugins/jenkins_builds b/etc/munin/plugins/jenkins_builds index 2f3a0380..bb9e44d9 100755 --- a/etc/munin/plugins/jenkins_builds +++ b/etc/munin/plugins/jenkins_builds @@ -29,17 +29,17 @@ if [ "$1" = "autoconf" ]; then exit 0 fi +# delete statefile if it's older than $update_interval set in /etc/munin/plugin-conf.d/jenkins +if test $(find $STATEFILE -mmin +$update_interval) ; then + rm -f $STATEFILE +fi + STATEFILE=$MUNIN_PLUGSTATE/$(basename $0) if [ -f $STATEFILE ] && [ "$1" = "" ] ; then cat $STATEFILE exit 0 fi -# delete statefile if it's older than $update_interval set in /etc/munin/plugin-conf.d/jenkins -if test $(find $STATEFILE -mmin +$update_interval) ; then - rm -f $STATEFILE -fi - JOB_PREFIXES=$(ls -1 /var/lib/jenkins/jobs/|cut -d "_" -f1|sort -f -u) if [ "$1" = "config" ]; then diff --git a/etc/munin/plugins/jenkins_builds_results b/etc/munin/plugins/jenkins_builds_results index 2dbd9d70..67d7396c 100755 --- a/etc/munin/plugins/jenkins_builds_results +++ b/etc/munin/plugins/jenkins_builds_results @@ -29,17 +29,17 @@ if [ "$1" = "autoconf" ]; then exit 0 fi +# delete statefile if it's older than $update_interval set in /etc/munin/plugin-conf.d/jenkins +if test $(find $STATEFILE -mmin +$update_interval) ; then + rm -f $STATEFILE +fi + STATEFILE=$MUNIN_PLUGSTATE/$(basename $0) if [ -f $STATEFILE ] && [ "$1" = "" ] ; then cat $STATEFILE exit 0 fi -# delete statefile if it's older than $update_interval set in /etc/munin/plugin-conf.d/jenkins -if test $(find $STATEFILE -mmin +$update_interval) ; then - rm -f $STATEFILE -fi - JOB_PREFIXES=$(ls -1 /var/lib/jenkins/jobs/|cut -d "_" -f1|sort -f -u) if [ "$1" = "config" ]; then diff --git a/etc/munin/plugins/jenkins_jobs b/etc/munin/plugins/jenkins_jobs index a755c3e9..1aed940f 100755 --- a/etc/munin/plugins/jenkins_jobs +++ b/etc/munin/plugins/jenkins_jobs @@ -29,17 +29,17 @@ if [ "$1" = "autoconf" ]; then exit 0 fi +# delete statefile if it's older than $update_interval set in /etc/munin/plugin-conf.d/jenkins +if test $(find $STATEFILE -mmin +$update_interval) ; then + rm -f $STATEFILE +fi + STATEFILE=$MUNIN_PLUGSTATE/$(basename $0) if [ -f $STATEFILE ] && [ "$1" = "" ] ; then cat $STATEFILE exit 0 fi -# delete statefile if it's older than $update_interval set in /etc/munin/plugin-conf.d/jenkins -if test $(find $STATEFILE -mmin +$update_interval) ; then - rm -f $STATEFILE -fi - JOB_PREFIXES=$(ls -1 /var/lib/jenkins/jobs/|cut -d "_" -f1|sort -f -u) if [ "$1" = "config" ]; then |