From 12156bb8436b3a86fbc3b16f335a768b767188cc Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Fri, 1 Jan 2016 18:53:27 +0100 Subject: reproducible armhf: add eleventh build node (and pbuilder/schroot setup jobs) on another rasberrypi2, thanks to Vagrant --- hosts/bpi0-armhf-rb/etc/pbuilderrc | 2 +- hosts/cbxi4pro0-armhf-rb/etc/pbuilderrc | 2 +- hosts/ff2a-armhf-rb/etc/pbuilderrc | 2 +- hosts/hb0-armhf-rb/etc/pbuilderrc | 2 +- hosts/jenkins-test-vm/etc/pbuilderrc | 2 +- hosts/jenkins/etc/munin/munin.conf | 12 +++++++++++- hosts/jenkins/etc/pbuilderrc | 2 +- hosts/odxu4-armhf-rb/etc/pbuilderrc | 2 +- hosts/odxu4b-armhf-rb/etc/pbuilderrc | 2 +- hosts/odxu4c-armhf-rb/etc/pbuilderrc | 2 +- hosts/profitbricks-build1-amd64/etc/pbuilderrc | 2 +- hosts/profitbricks-build2-amd64/etc/pbuilderrc | 2 +- hosts/profitbricks-build5-amd64/etc/pbuilderrc | 2 +- hosts/profitbricks-build6-amd64/etc/pbuilderrc | 2 +- hosts/rpi2b-armhf-rb/etc/munin/munin-node.conf | 2 +- hosts/rpi2b-armhf-rb/etc/pbuilderrc | 2 +- hosts/rpi2b-armhf-rb/etc/postfix/main.cf | 4 ++-- hosts/wbd0-armhf-rb/etc/pbuilderrc | 2 +- hosts/wbq0-armhf-rb/etc/pbuilderrc | 2 +- 19 files changed, 30 insertions(+), 20 deletions(-) (limited to 'hosts') diff --git a/hosts/bpi0-armhf-rb/etc/pbuilderrc b/hosts/bpi0-armhf-rb/etc/pbuilderrc index aa5fb071..d8ae4129 100644 --- a/hosts/bpi0-armhf-rb/etc/pbuilderrc +++ b/hosts/bpi0-armhf-rb/etc/pbuilderrc @@ -6,7 +6,7 @@ # read pbuilderrc.5 document for notes on specific options. case $HOSTNAME in jenkins|profitbricks-build?-amd64) MIRRORSITE=http://ftp.de.debian.org/debian ;; - bpi0|cbxi4pro0|hb0|wbq0|odxu4*|wbd0|rpi2b|ff2a) MIRRORSITE=http://ftp.us.debian.org/debian ;; + bpi0|cbxi4pro0|hb0|wbq0|odxu4*|wbd0|rpi2*|ff2a) MIRRORSITE=http://ftp.us.debian.org/debian ;; *) echo "unsupported host, exiting." ; exit 1 ;; esac EXTRAPACKAGES="" # better list them in bin/reproducible_setup_pbuilder.sh diff --git a/hosts/cbxi4pro0-armhf-rb/etc/pbuilderrc b/hosts/cbxi4pro0-armhf-rb/etc/pbuilderrc index aa5fb071..d8ae4129 100644 --- a/hosts/cbxi4pro0-armhf-rb/etc/pbuilderrc +++ b/hosts/cbxi4pro0-armhf-rb/etc/pbuilderrc @@ -6,7 +6,7 @@ # read pbuilderrc.5 document for notes on specific options. case $HOSTNAME in jenkins|profitbricks-build?-amd64) MIRRORSITE=http://ftp.de.debian.org/debian ;; - bpi0|cbxi4pro0|hb0|wbq0|odxu4*|wbd0|rpi2b|ff2a) MIRRORSITE=http://ftp.us.debian.org/debian ;; + bpi0|cbxi4pro0|hb0|wbq0|odxu4*|wbd0|rpi2*|ff2a) MIRRORSITE=http://ftp.us.debian.org/debian ;; *) echo "unsupported host, exiting." ; exit 1 ;; esac EXTRAPACKAGES="" # better list them in bin/reproducible_setup_pbuilder.sh diff --git a/hosts/ff2a-armhf-rb/etc/pbuilderrc b/hosts/ff2a-armhf-rb/etc/pbuilderrc index aa5fb071..d8ae4129 100644 --- a/hosts/ff2a-armhf-rb/etc/pbuilderrc +++ b/hosts/ff2a-armhf-rb/etc/pbuilderrc @@ -6,7 +6,7 @@ # read pbuilderrc.5 document for notes on specific options. case $HOSTNAME in jenkins|profitbricks-build?-amd64) MIRRORSITE=http://ftp.de.debian.org/debian ;; - bpi0|cbxi4pro0|hb0|wbq0|odxu4*|wbd0|rpi2b|ff2a) MIRRORSITE=http://ftp.us.debian.org/debian ;; + bpi0|cbxi4pro0|hb0|wbq0|odxu4*|wbd0|rpi2*|ff2a) MIRRORSITE=http://ftp.us.debian.org/debian ;; *) echo "unsupported host, exiting." ; exit 1 ;; esac EXTRAPACKAGES="" # better list them in bin/reproducible_setup_pbuilder.sh diff --git a/hosts/hb0-armhf-rb/etc/pbuilderrc b/hosts/hb0-armhf-rb/etc/pbuilderrc index aa5fb071..d8ae4129 100644 --- a/hosts/hb0-armhf-rb/etc/pbuilderrc +++ b/hosts/hb0-armhf-rb/etc/pbuilderrc @@ -6,7 +6,7 @@ # read pbuilderrc.5 document for notes on specific options. case $HOSTNAME in jenkins|profitbricks-build?-amd64) MIRRORSITE=http://ftp.de.debian.org/debian ;; - bpi0|cbxi4pro0|hb0|wbq0|odxu4*|wbd0|rpi2b|ff2a) MIRRORSITE=http://ftp.us.debian.org/debian ;; + bpi0|cbxi4pro0|hb0|wbq0|odxu4*|wbd0|rpi2*|ff2a) MIRRORSITE=http://ftp.us.debian.org/debian ;; *) echo "unsupported host, exiting." ; exit 1 ;; esac EXTRAPACKAGES="" # better list them in bin/reproducible_setup_pbuilder.sh diff --git a/hosts/jenkins-test-vm/etc/pbuilderrc b/hosts/jenkins-test-vm/etc/pbuilderrc index aa5fb071..d8ae4129 100644 --- a/hosts/jenkins-test-vm/etc/pbuilderrc +++ b/hosts/jenkins-test-vm/etc/pbuilderrc @@ -6,7 +6,7 @@ # read pbuilderrc.5 document for notes on specific options. case $HOSTNAME in jenkins|profitbricks-build?-amd64) MIRRORSITE=http://ftp.de.debian.org/debian ;; - bpi0|cbxi4pro0|hb0|wbq0|odxu4*|wbd0|rpi2b|ff2a) MIRRORSITE=http://ftp.us.debian.org/debian ;; + bpi0|cbxi4pro0|hb0|wbq0|odxu4*|wbd0|rpi2*|ff2a) MIRRORSITE=http://ftp.us.debian.org/debian ;; *) echo "unsupported host, exiting." ; exit 1 ;; esac EXTRAPACKAGES="" # better list them in bin/reproducible_setup_pbuilder.sh diff --git a/hosts/jenkins/etc/munin/munin.conf b/hosts/jenkins/etc/munin/munin.conf index 601080cb..7efe3c59 100644 --- a/hosts/jenkins/etc/munin/munin.conf +++ b/hosts/jenkins/etc/munin/munin.conf @@ -268,6 +268,16 @@ contact.me.command mail -s "Munin notification ${var:host}" root diskstats_utilization.graph no diskstats_iops.graph no +[rpi2c-armhf-rb.debian.net] + address ssh://jenkins@rpi2c-armhf-rb.debian.net:2235/bin/nc localhost 4949 + use_node_name yes + diskstats_latency.sda.avgwrwait.warning 0:20 + diskstats_latency.sda.avgrdwait.warning 0:10 + diskstats_latency.graph no + diskstats_throughput.graph no + diskstats_utilization.graph no + diskstats_iops.graph no + [odxu4b-armhf-rb.debian.net] address ssh://jenkins@odxu4b-armhf-rb.debian.net:2232/bin/nc localhost 4949 use_node_name yes @@ -347,5 +357,5 @@ contact.me.command mail -s "Munin notification ${var:host}" root # node_order Totals fii.foo.com fay.foo.com # [debian.net;] - node_order jenkins.debian.net profitbricks-build1-amd64.debian.net profitbricks-build2-amd64.debian.net profitbricks-build3-amd64.debian.net profitbricks-build4-amd64.debian.net profitbricks-build5-amd64.debian.net profitbricks-build6-amd64.debian.net bpi0-armhf-rb.debian.net cbxi4pro0-armhf-rb.debian.net ff2a-armhf-rb.debian.net hb0-armhf-rb.debian.net odxu4-armhf-rb.debian.net odxu4b-armhf-rb.debian.net odxu4c-armhf-rb.debian.net rpi2b-armhf-rb.debian.net wbd0-armhf-rb.debian.net wbq0-armhf-rb.debian.net freebsd-jenkins.debian.net + node_order jenkins.debian.net profitbricks-build1-amd64.debian.net profitbricks-build2-amd64.debian.net profitbricks-build3-amd64.debian.net profitbricks-build4-amd64.debian.net profitbricks-build5-amd64.debian.net profitbricks-build6-amd64.debian.net bpi0-armhf-rb.debian.net cbxi4pro0-armhf-rb.debian.net ff2a-armhf-rb.debian.net hb0-armhf-rb.debian.net odxu4-armhf-rb.debian.net odxu4b-armhf-rb.debian.net odxu4c-armhf-rb.debian.net rpi2b-armhf-rb.debian.net rpi2c-armhf-rb.debian.net wbd0-armhf-rb.debian.net wbq0-armhf-rb.debian.net freebsd-jenkins.debian.net diff --git a/hosts/jenkins/etc/pbuilderrc b/hosts/jenkins/etc/pbuilderrc index aa5fb071..d8ae4129 100644 --- a/hosts/jenkins/etc/pbuilderrc +++ b/hosts/jenkins/etc/pbuilderrc @@ -6,7 +6,7 @@ # read pbuilderrc.5 document for notes on specific options. case $HOSTNAME in jenkins|profitbricks-build?-amd64) MIRRORSITE=http://ftp.de.debian.org/debian ;; - bpi0|cbxi4pro0|hb0|wbq0|odxu4*|wbd0|rpi2b|ff2a) MIRRORSITE=http://ftp.us.debian.org/debian ;; + bpi0|cbxi4pro0|hb0|wbq0|odxu4*|wbd0|rpi2*|ff2a) MIRRORSITE=http://ftp.us.debian.org/debian ;; *) echo "unsupported host, exiting." ; exit 1 ;; esac EXTRAPACKAGES="" # better list them in bin/reproducible_setup_pbuilder.sh diff --git a/hosts/odxu4-armhf-rb/etc/pbuilderrc b/hosts/odxu4-armhf-rb/etc/pbuilderrc index aa5fb071..d8ae4129 100644 --- a/hosts/odxu4-armhf-rb/etc/pbuilderrc +++ b/hosts/odxu4-armhf-rb/etc/pbuilderrc @@ -6,7 +6,7 @@ # read pbuilderrc.5 document for notes on specific options. case $HOSTNAME in jenkins|profitbricks-build?-amd64) MIRRORSITE=http://ftp.de.debian.org/debian ;; - bpi0|cbxi4pro0|hb0|wbq0|odxu4*|wbd0|rpi2b|ff2a) MIRRORSITE=http://ftp.us.debian.org/debian ;; + bpi0|cbxi4pro0|hb0|wbq0|odxu4*|wbd0|rpi2*|ff2a) MIRRORSITE=http://ftp.us.debian.org/debian ;; *) echo "unsupported host, exiting." ; exit 1 ;; esac EXTRAPACKAGES="" # better list them in bin/reproducible_setup_pbuilder.sh diff --git a/hosts/odxu4b-armhf-rb/etc/pbuilderrc b/hosts/odxu4b-armhf-rb/etc/pbuilderrc index aa5fb071..d8ae4129 100644 --- a/hosts/odxu4b-armhf-rb/etc/pbuilderrc +++ b/hosts/odxu4b-armhf-rb/etc/pbuilderrc @@ -6,7 +6,7 @@ # read pbuilderrc.5 document for notes on specific options. case $HOSTNAME in jenkins|profitbricks-build?-amd64) MIRRORSITE=http://ftp.de.debian.org/debian ;; - bpi0|cbxi4pro0|hb0|wbq0|odxu4*|wbd0|rpi2b|ff2a) MIRRORSITE=http://ftp.us.debian.org/debian ;; + bpi0|cbxi4pro0|hb0|wbq0|odxu4*|wbd0|rpi2*|ff2a) MIRRORSITE=http://ftp.us.debian.org/debian ;; *) echo "unsupported host, exiting." ; exit 1 ;; esac EXTRAPACKAGES="" # better list them in bin/reproducible_setup_pbuilder.sh diff --git a/hosts/odxu4c-armhf-rb/etc/pbuilderrc b/hosts/odxu4c-armhf-rb/etc/pbuilderrc index aa5fb071..d8ae4129 100644 --- a/hosts/odxu4c-armhf-rb/etc/pbuilderrc +++ b/hosts/odxu4c-armhf-rb/etc/pbuilderrc @@ -6,7 +6,7 @@ # read pbuilderrc.5 document for notes on specific options. case $HOSTNAME in jenkins|profitbricks-build?-amd64) MIRRORSITE=http://ftp.de.debian.org/debian ;; - bpi0|cbxi4pro0|hb0|wbq0|odxu4*|wbd0|rpi2b|ff2a) MIRRORSITE=http://ftp.us.debian.org/debian ;; + bpi0|cbxi4pro0|hb0|wbq0|odxu4*|wbd0|rpi2*|ff2a) MIRRORSITE=http://ftp.us.debian.org/debian ;; *) echo "unsupported host, exiting." ; exit 1 ;; esac EXTRAPACKAGES="" # better list them in bin/reproducible_setup_pbuilder.sh diff --git a/hosts/profitbricks-build1-amd64/etc/pbuilderrc b/hosts/profitbricks-build1-amd64/etc/pbuilderrc index aa5fb071..d8ae4129 100644 --- a/hosts/profitbricks-build1-amd64/etc/pbuilderrc +++ b/hosts/profitbricks-build1-amd64/etc/pbuilderrc @@ -6,7 +6,7 @@ # read pbuilderrc.5 document for notes on specific options. case $HOSTNAME in jenkins|profitbricks-build?-amd64) MIRRORSITE=http://ftp.de.debian.org/debian ;; - bpi0|cbxi4pro0|hb0|wbq0|odxu4*|wbd0|rpi2b|ff2a) MIRRORSITE=http://ftp.us.debian.org/debian ;; + bpi0|cbxi4pro0|hb0|wbq0|odxu4*|wbd0|rpi2*|ff2a) MIRRORSITE=http://ftp.us.debian.org/debian ;; *) echo "unsupported host, exiting." ; exit 1 ;; esac EXTRAPACKAGES="" # better list them in bin/reproducible_setup_pbuilder.sh diff --git a/hosts/profitbricks-build2-amd64/etc/pbuilderrc b/hosts/profitbricks-build2-amd64/etc/pbuilderrc index aa5fb071..d8ae4129 100644 --- a/hosts/profitbricks-build2-amd64/etc/pbuilderrc +++ b/hosts/profitbricks-build2-amd64/etc/pbuilderrc @@ -6,7 +6,7 @@ # read pbuilderrc.5 document for notes on specific options. case $HOSTNAME in jenkins|profitbricks-build?-amd64) MIRRORSITE=http://ftp.de.debian.org/debian ;; - bpi0|cbxi4pro0|hb0|wbq0|odxu4*|wbd0|rpi2b|ff2a) MIRRORSITE=http://ftp.us.debian.org/debian ;; + bpi0|cbxi4pro0|hb0|wbq0|odxu4*|wbd0|rpi2*|ff2a) MIRRORSITE=http://ftp.us.debian.org/debian ;; *) echo "unsupported host, exiting." ; exit 1 ;; esac EXTRAPACKAGES="" # better list them in bin/reproducible_setup_pbuilder.sh diff --git a/hosts/profitbricks-build5-amd64/etc/pbuilderrc b/hosts/profitbricks-build5-amd64/etc/pbuilderrc index 739625da..7ca73205 100644 --- a/hosts/profitbricks-build5-amd64/etc/pbuilderrc +++ b/hosts/profitbricks-build5-amd64/etc/pbuilderrc @@ -6,7 +6,7 @@ # read pbuilderrc.5 document for notes on specific options. case $HOSTNAME in jenkins|profitbricks-build?-amd64) MIRRORSITE=http://ftp.de.debian.org/debian ;; - bpi0|cbxi4pro0|hb0|wbq0|odxu4*|wbd0|rpi2b|ff2a) MIRRORSITE=http://ftp.us.debian.org/debian ;; + bpi0|cbxi4pro0|hb0|wbq0|odxu4*|wbd0|rpi2*|ff2a) MIRRORSITE=http://ftp.us.debian.org/debian ;; *) echo "unsupported host, exiting." ; exit 1 ;; esac EXTRAPACKAGES="" # better list them in bin/reproducible_setup_pbuilder.sh diff --git a/hosts/profitbricks-build6-amd64/etc/pbuilderrc b/hosts/profitbricks-build6-amd64/etc/pbuilderrc index 739625da..7ca73205 100644 --- a/hosts/profitbricks-build6-amd64/etc/pbuilderrc +++ b/hosts/profitbricks-build6-amd64/etc/pbuilderrc @@ -6,7 +6,7 @@ # read pbuilderrc.5 document for notes on specific options. case $HOSTNAME in jenkins|profitbricks-build?-amd64) MIRRORSITE=http://ftp.de.debian.org/debian ;; - bpi0|cbxi4pro0|hb0|wbq0|odxu4*|wbd0|rpi2b|ff2a) MIRRORSITE=http://ftp.us.debian.org/debian ;; + bpi0|cbxi4pro0|hb0|wbq0|odxu4*|wbd0|rpi2*|ff2a) MIRRORSITE=http://ftp.us.debian.org/debian ;; *) echo "unsupported host, exiting." ; exit 1 ;; esac EXTRAPACKAGES="" # better list them in bin/reproducible_setup_pbuilder.sh diff --git a/hosts/rpi2b-armhf-rb/etc/munin/munin-node.conf b/hosts/rpi2b-armhf-rb/etc/munin/munin-node.conf index d22b495a..4b758008 100644 --- a/hosts/rpi2b-armhf-rb/etc/munin/munin-node.conf +++ b/hosts/rpi2b-armhf-rb/etc/munin/munin-node.conf @@ -63,4 +63,4 @@ host * port 4949 allow ^78\.137\.96\.196 -hostname wbd0-armhf-rb.debian.net +hostname rpi2b-armhf-rb.debian.net diff --git a/hosts/rpi2b-armhf-rb/etc/pbuilderrc b/hosts/rpi2b-armhf-rb/etc/pbuilderrc index aa5fb071..d8ae4129 100644 --- a/hosts/rpi2b-armhf-rb/etc/pbuilderrc +++ b/hosts/rpi2b-armhf-rb/etc/pbuilderrc @@ -6,7 +6,7 @@ # read pbuilderrc.5 document for notes on specific options. case $HOSTNAME in jenkins|profitbricks-build?-amd64) MIRRORSITE=http://ftp.de.debian.org/debian ;; - bpi0|cbxi4pro0|hb0|wbq0|odxu4*|wbd0|rpi2b|ff2a) MIRRORSITE=http://ftp.us.debian.org/debian ;; + bpi0|cbxi4pro0|hb0|wbq0|odxu4*|wbd0|rpi2*|ff2a) MIRRORSITE=http://ftp.us.debian.org/debian ;; *) echo "unsupported host, exiting." ; exit 1 ;; esac EXTRAPACKAGES="" # better list them in bin/reproducible_setup_pbuilder.sh diff --git a/hosts/rpi2b-armhf-rb/etc/postfix/main.cf b/hosts/rpi2b-armhf-rb/etc/postfix/main.cf index 3d93e6ce..ea91ceed 100644 --- a/hosts/rpi2b-armhf-rb/etc/postfix/main.cf +++ b/hosts/rpi2b-armhf-rb/etc/postfix/main.cf @@ -27,11 +27,11 @@ smtp_tls_session_cache_database = btree:${data_directory}/smtp_scache # See /usr/share/doc/postfix/TLS_README.gz in the postfix-doc package for # information on enabling SSL in the smtp client. -myhostname = wbd0-armhf-rb.debian.net +myhostname = rpi2b-armhf-rb.debian.net alias_maps = hash:/etc/aliases alias_database = hash:/etc/aliases myorigin = /etc/mailname -mydestination = wbd0-armhf-rb.debian.net, localhost +mydestination = rpi2b-armhf-rb.debian.net, localhost relayhost = #mynetworks = 127.0.0.0/8 [::ffff:127.0.0.0]/104 [::1]/128 mynetworks = 127.0.0.0/8 diff --git a/hosts/wbd0-armhf-rb/etc/pbuilderrc b/hosts/wbd0-armhf-rb/etc/pbuilderrc index aa5fb071..d8ae4129 100644 --- a/hosts/wbd0-armhf-rb/etc/pbuilderrc +++ b/hosts/wbd0-armhf-rb/etc/pbuilderrc @@ -6,7 +6,7 @@ # read pbuilderrc.5 document for notes on specific options. case $HOSTNAME in jenkins|profitbricks-build?-amd64) MIRRORSITE=http://ftp.de.debian.org/debian ;; - bpi0|cbxi4pro0|hb0|wbq0|odxu4*|wbd0|rpi2b|ff2a) MIRRORSITE=http://ftp.us.debian.org/debian ;; + bpi0|cbxi4pro0|hb0|wbq0|odxu4*|wbd0|rpi2*|ff2a) MIRRORSITE=http://ftp.us.debian.org/debian ;; *) echo "unsupported host, exiting." ; exit 1 ;; esac EXTRAPACKAGES="" # better list them in bin/reproducible_setup_pbuilder.sh diff --git a/hosts/wbq0-armhf-rb/etc/pbuilderrc b/hosts/wbq0-armhf-rb/etc/pbuilderrc index aa5fb071..d8ae4129 100644 --- a/hosts/wbq0-armhf-rb/etc/pbuilderrc +++ b/hosts/wbq0-armhf-rb/etc/pbuilderrc @@ -6,7 +6,7 @@ # read pbuilderrc.5 document for notes on specific options. case $HOSTNAME in jenkins|profitbricks-build?-amd64) MIRRORSITE=http://ftp.de.debian.org/debian ;; - bpi0|cbxi4pro0|hb0|wbq0|odxu4*|wbd0|rpi2b|ff2a) MIRRORSITE=http://ftp.us.debian.org/debian ;; + bpi0|cbxi4pro0|hb0|wbq0|odxu4*|wbd0|rpi2*|ff2a) MIRRORSITE=http://ftp.us.debian.org/debian ;; *) echo "unsupported host, exiting." ; exit 1 ;; esac EXTRAPACKAGES="" # better list them in bin/reproducible_setup_pbuilder.sh -- cgit v1.2.3-70-g09d2