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 --- README | 2 +- THANKS.head | 4 ++-- bin/common-functions.sh | 4 ++-- bin/jenkins_master_wrapper.sh | 3 +++ bin/reproducible_common.sh | 2 +- 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 +- job-cfg/reproducible.yaml | 2 ++ 25 files changed, 41 insertions(+), 26 deletions(-) diff --git a/README b/README index 32c2ddef..72649781 100644 --- a/README +++ b/README @@ -140,7 +140,7 @@ Installation tests inside chroot environments. * Currently, three suites are tested on 'amd64' and 'armhf' architectures: 'testing', 'unstable' and 'experimental'. The tests are done using 'pbuilder' using link:https://wiki.debian.org/ReproducibleBuilds/ExperimentalToolchain[our toolchain] through concurrent builder jobs, 32 for 'amd64' and 21 for 'armhf', which are each constantly testing packages and saving the results of these tests. ** These builds on remote nodes run on very different hardware: for 'amd64' we are now using four virtual machines, profitbricks-build(1+2+5+6)-amd64, which have 16 or 17 cores and 48gb ram each and are sponsored by link:https://jenkins.debian.net/userContent/thanks.html[Profitbricks]. -** To test 'armhf' we are using ten small boards donated by vagrant@d.o: six quad cores (wbq0, cbxi4pro0, ff2a, odxu4, odxu4b and odxu4c) with 2gb ram, another quad-core (rpi2b) with 1gb ram and three dual cores (bpi0, hb0 and wbd0) with 1gb ram, each. We would love to have more or more powerful ARM hardware in the future, if you can help, please talk to us! +** To test 'armhf' we are using eleven small boards donated by vagrant@d.o: six quad cores (wbq0, cbxi4pro0, ff2a, odxu4, odxu4b and odxu4c) with 2gb ram, two quad-cores (rpi2b and rpi2c) with 1gb ram and three dual cores (bpi0, hb0 and wbd0) with 1gb ram, each. We would love to have more or more powerful ARM hardware in the future, if you can help, please talk to us! * Packages to be build are scheduled in the SQLite database via a scheduler job, which runs every hour and if the queue is below a certain threshold schedules four types of packages: ** new untested packages (either uploaded to 'unstable' or 'experimental' or migrated to 'testing'), diff --git a/THANKS.head b/THANKS.head index a2c3aa41..28ce7173 100644 --- a/THANKS.head +++ b/THANKS.head @@ -12,9 +12,9 @@ ** 18 cores and 48 GB memory for profitbricks-build6-amd64.debian.net ** 3 cores and 6 GB memory for freebsd-jenkins.debian.net (also running on Profitbricks virtual hardware) * link:https://globalsign.com[GlobalSign] in January 2015 kindly provided free of charge SSL certificates for both jenkins.debian.net and reproducible.debian.net. - * link:https://qa.debian.org/developer.php?login=vagrant%40debian.org[Vagrant] is kindly providing and hosting ten 'armhf' systems: + * link:https://qa.debian.org/developer.php?login=vagrant%40debian.org[Vagrant] is kindly providing and hosting eleven 'armhf' systems: ** six quad-cores with 2 GB RAM each, - ** one quad-core with 1 GB RAM and + ** two quad-cores with 1 GB RAM and ** three dual-cores with 1 GB RAM. === Contributors diff --git a/bin/common-functions.sh b/bin/common-functions.sh index 9b484155..eaaf1753 100755 --- a/bin/common-functions.sh +++ b/bin/common-functions.sh @@ -57,14 +57,14 @@ else if [ -z "$MIRROR" ]; then case $HOSTNAME in jenkins|jenkins-test-vm|profitbricks-build?-amd64) export MIRROR=http://ftp.de.debian.org/debian ;; - bpi0|cbxi4pro0|hb0|wbq0|odxu4*|wbd0|rpi2b|ff2a) export MIRROR=http://ftp.us.debian.org/debian ;; + bpi0|cbxi4pro0|hb0|wbq0|odxu4*|wbd0|rpi2*|ff2a) export MIRROR=http://ftp.us.debian.org/debian ;; *) echo "unsupported host, exiting." ; exit 1 ;; esac fi if [ -z "$http_proxy" ]; then case $HOSTNAME in jenkins|jenkins-test-vm|profitbricks-build?-amd64) export http_proxy="http://localhost:3128" ;; - bpi0|cbxi4pro0|hb0|wbq0|odxu4*|wbd0|rpi2b|ff2a) export http_proxy="http://10.0.0.15:8000/" ;; + bpi0|cbxi4pro0|hb0|wbq0|odxu4*|wbd0|rpi2*|ff2a) export http_proxy="http://10.0.0.15:8000/" ;; *) echo "unsupported host, exiting." ; exit 1 ;; esac fi diff --git a/bin/jenkins_master_wrapper.sh b/bin/jenkins_master_wrapper.sh index 34e8fc0c..d75f0e8a 100755 --- a/bin/jenkins_master_wrapper.sh +++ b/bin/jenkins_master_wrapper.sh @@ -35,6 +35,9 @@ case "$NODE_NAME" in rpi2b-armhf-rb.debian.net) PORT=2230 ;; + rpi2c-armhf-rb.debian.net) + PORT=2235 + ;; odxu4b-armhf-rb.debian.net) PORT=2232 ;; diff --git a/bin/reproducible_common.sh b/bin/reproducible_common.sh index 4cdc28f5..4eb1dd79 100755 --- a/bin/reproducible_common.sh +++ b/bin/reproducible_common.sh @@ -46,7 +46,7 @@ SUITES="testing unstable experimental" ARCHS="amd64 armhf" # define Debian build nodes in use -BUILD_NODES="profitbricks-build1-amd64.debian.net profitbricks-build2-amd64.debian.net profitbricks-build5-amd64.debian.net profitbricks-build6-amd64.debian.net wbq0-armhf-rb.debian.net cbxi4pro0-armhf-rb.debian.net bpi0-armhf-rb.debian.net hb0-armhf-rb.debian.net odxu4-armhf-rb.debian.net wbd0-armhf-rb.debian.net rpi2b-armhf-rb.debian.net odxu4b-armhf-rb.debian.net odxu4c-armhf-rb.debian.net ff2a-armhf-rb.debian.net" # these also needs to be defined in bin/jenkins_master_wrapper.sh +BUILD_NODES="profitbricks-build1-amd64.debian.net profitbricks-build2-amd64.debian.net profitbricks-build5-amd64.debian.net profitbricks-build6-amd64.debian.net wbq0-armhf-rb.debian.net cbxi4pro0-armhf-rb.debian.net bpi0-armhf-rb.debian.net hb0-armhf-rb.debian.net odxu4-armhf-rb.debian.net wbd0-armhf-rb.debian.net rpi2b-armhf-rb.debian.net rpi2c-armhf-rb.debian.net odxu4b-armhf-rb.debian.net odxu4c-armhf-rb.debian.net ff2a-armhf-rb.debian.net" # these also needs to be defined in bin/jenkins_master_wrapper.sh BUILD_ENV_VARS="ARCH NUM_CPU CPU_MODEL DATETIME KERNEL1 KERNEL2" # these also needs to be defined in bin/reproducible_info.sh # existing usertags in the Debian BTS 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 diff --git a/job-cfg/reproducible.yaml b/job-cfg/reproducible.yaml index 396b0444..4ae8b097 100644 --- a/job-cfg/reproducible.yaml +++ b/job-cfg/reproducible.yaml @@ -268,6 +268,7 @@ - 'odxu4c': { my_arch: 'armhf' } - 'wbd0': { my_arch: 'armhf' } - 'rpi2b': { my_arch: 'armhf' } + - 'rpi2c': { my_arch: 'armhf' } - 'profitbricks1': { my_arch: 'amd64' } - 'profitbricks2': { my_arch: 'amd64' } - 'profitbricks3': { my_arch: 'amd64' } @@ -306,6 +307,7 @@ - 'odxu4c': { my_arch: 'armhf' } - 'wbd0': { my_arch: 'armhf' } - 'rpi2b': { my_arch: 'armhf' } + - 'rpi2c': { my_arch: 'armhf' } - 'profitbricks1': { my_arch: 'amd64' } - 'profitbricks2': { my_arch: 'amd64' } - 'profitbricks5': { my_arch: 'amd64' } -- cgit v1.2.3-70-g09d2