diff options
| -rw-r--r-- | TODO | 5 | ||||
| -rwxr-xr-x | bin/reproducible_info.sh | 4 | ||||
| -rw-r--r-- | hosts/jenkins/etc/munin/munin.conf | 8 |
3 files changed, 7 insertions, 10 deletions
@@ -71,9 +71,6 @@ The plan is to run a jenkins.d.o host, which is maintained by DSA, but we are ma ** not suitable for jenkins.d.o, thus we will run all tests on slaves, where DSA doesnt care what we do * livescreenshot plugin (we use a patched version) is ok: ** jenkins maintenance probably is best done by jenkins users (as opposed to DSA) so it's up to us what plugins we install -* munin monitoring of the slaves -** DSA munin configuration is auto generated by puppet, so the slaves should become .d.o hosts too, to be included -** or install another munin instance, just to monitor the slaves, on jenkins itself * chroot jobs should use real schroot sessions, and not just use schroot as poor chroot(8) replacement. some links: ** https://anonscm.debian.org/cgit/mirror/dsa-puppet.git/tree/modules/schroot ** https://anonscm.debian.org/cgit/mirror/dsa-puppet.git/tree/modules/porterbox/files/dd-schroot-cmd @@ -259,8 +256,6 @@ properties: ==== reproducible Debian armhf * monitor their temperatures via munin via ssh: -** http://munin-monitoring.org/wiki/Native_ssh -** http://guide.munin-monitoring.org/en/latest/example/transport/ssh.html * make systems send mail * change date on 2nd build hosts (and disable systemd-timesyncd) diff --git a/bin/reproducible_info.sh b/bin/reproducible_info.sh index c73fef65..4f44e658 100755 --- a/bin/reproducible_info.sh +++ b/bin/reproducible_info.sh @@ -10,5 +10,7 @@ NUM_CPU=$(grep -c '^processor' /proc/cpuinfo) DATETIME=$(date +'%Y-%m-%d %H:%M %Z') for i in ARCH NUM_CPU DATETIME ; do - echo "$i['$HOSTNAME']=\"${!i}\"" + if [ "$1" = "$i" ] ; then + echo "${!i}" + fi done diff --git a/hosts/jenkins/etc/munin/munin.conf b/hosts/jenkins/etc/munin/munin.conf index 38c21ead..493ff325 100644 --- a/hosts/jenkins/etc/munin/munin.conf +++ b/hosts/jenkins/etc/munin/munin.conf @@ -122,19 +122,19 @@ contact.me.command mail -s "Munin notification ${var:host}" root use_node_name yes [bpi0-armhf-rb.debian.net] - address ssh://bpi0-armhf-rb.debian.net/bin/nc localhost 4949 + address ssh://bpi0-armhf-rb.debian.net:2222/bin/nc localhost 4949 use_node_name yes [hb0-armhf-rb.debian.net] - address ssh://hb0-armhf-rb.debian.net/bin/nc localhost 4949 + address ssh://hb0-armhf-rb.debian.net:2224/bin/nc localhost 4949 use_node_name yes [wbq0-armhf-rb.debian.net] - address ssh://wbq0-armhf-rb.debian.net/bin/nc localhost 4949 + address ssh://wbq0-armhf-rb.debian.net:2225/bin/nc localhost 4949 use_node_name yes [cbxi4pro0-armhf-rb.debian.net] - address ssh://cbxi4pro0-armhf-rb.debian.net/bin/nc localhost 4949 + address ssh://cbxi4pro0-armhf-rb.debian.net:2226/bin/nc localhost 4949 use_node_name yes [freebsd-jenkins.debian.net] |