reproducible armhf: add new armhf node, thanks to Vagrant

28 files changed, 45 insertions, 30 deletions

diff --git a/README b/README
index 1e92c0be..5606e748 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 34 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 18 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 14 small boards donated by vagrant@d.o: nine quad cores (wbq0, cbxi4pro0, ff2a, ff2b odxu4, odxu4b, odxu4c, opi2a and opi2b) 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!
+** To test 'armhf' we are using 15 small boards donated by vagrant@d.o: ten quad cores (wbq0, cbxi4a, cbxi4pro0, ff2a, ff2b odxu4, odxu4b, odxu4c, opi2a and opi2b) 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 7db7cc13..82eee495 100644
--- a/THANKS.head
+++ b/THANKS.head
@@ -11,8 +11,8 @@
  ** 17 cores and 48 GB memory for profitbricks-build5-amd64.debian.net
  ** 17 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://qa.debian.org/developer.php?login=vagrant%40debian.org[Vagrant] provides and hosts 14 'armhf' systems:
- ** nine quad-cores with 2 GB RAM each,
+ * link:https://qa.debian.org/developer.php?login=vagrant%40debian.org[Vagrant] provides and hosts 15 'armhf' systems:
+ ** ten quad-cores with 2 GB RAM each,
  ** two quad-cores with 1 GB RAM and
  ** three dual-cores with 1 GB RAM.
  * link:https://letsencrypt.org[Let's encrypt] provides free of charge SSL certificates for jenkins.debian.net, reproducible.debian.net and tests.reproducible-builds.org.
diff --git a/bin/common-functions.sh b/bin/common-functions.sh
index 8dafc875..9c35cc9c 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|rpi2*|ff2*|opi2*)		export MIRROR=http://ftp.us.debian.org/debian ;;
+			bpi0|cbxi4*|hb0|wbq0|odxu4*|wbd0|rpi2*|ff2*|opi2*)		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|rpi2*|ff2*|opi2*)		export http_proxy="http://10.0.0.15:8000/" ;;
+			bpi0|cbxi4*|hb0|wbq0|odxu4*|wbd0|rpi2*|ff2*|opi2*)		export http_proxy="http://10.0.0.15:8000/" ;;
 			*)								echo "unsupported host, exiting." ; exit 1 ;;
 		esac
 	fi
diff --git a/bin/jenkins_node_definitions.sh b/bin/jenkins_node_definitions.sh
index 5952ecb1..a6ea57d6 100755
--- a/bin/jenkins_node_definitions.sh
+++ b/bin/jenkins_node_definitions.sh
@@ -4,7 +4,7 @@
 # released under the GPLv=2
 
 # 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 rpi2c-armhf-rb.debian.net odxu4b-armhf-rb.debian.net odxu4c-armhf-rb.debian.net ff2a-armhf-rb.debian.net ff2b-armhf-rb.debian.net opi2a-armhf-rb.debian.net opi2b-armhf-rb.debian.net"
+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 cbxi4a-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 ff2b-armhf-rb.debian.net opi2a-armhf-rb.debian.net opi2b-armhf-rb.debian.net"
 
 # return the ports sshd is listening on
 get_node_ssh_port() {
@@ -19,6 +19,9 @@ get_node_ssh_port() {
 	  wbq0-armhf-rb.debian.net)
 	    PORT=2225
 	    ;;
+	  cbxi4a-armhf-rb.debian.net)
+	    PORT=2239
+	    ;;
 	  cbxi4pro0-armhf-rb.debian.net)
 	    PORT=2226
 	    ;;
diff --git a/hosts/bpi0-armhf-rb/etc/pbuilderrc b/hosts/bpi0-armhf-rb/etc/pbuilderrc
index ab3ac9a5..30fcc2e1 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|rpi2*|ff2*|opi2*)	MIRRORSITE=http://ftp.us.debian.org/debian ;;
+	bpi0|cbxi4*|hb0|wbq0|odxu4*|wbd0|rpi2*|ff2*|opi2*)	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 ab3ac9a5..30fcc2e1 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|rpi2*|ff2*|opi2*)	MIRRORSITE=http://ftp.us.debian.org/debian ;;
+	bpi0|cbxi4*|hb0|wbq0|odxu4*|wbd0|rpi2*|ff2*|opi2*)	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 ab3ac9a5..30fcc2e1 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|rpi2*|ff2*|opi2*)	MIRRORSITE=http://ftp.us.debian.org/debian ;;
+	bpi0|cbxi4*|hb0|wbq0|odxu4*|wbd0|rpi2*|ff2*|opi2*)	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/ff2b-armhf-rb/etc/pbuilderrc b/hosts/ff2b-armhf-rb/etc/pbuilderrc
index ab3ac9a5..30fcc2e1 100644
--- a/hosts/ff2b-armhf-rb/etc/pbuilderrc
+++ b/hosts/ff2b-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|rpi2*|ff2*|opi2*)	MIRRORSITE=http://ftp.us.debian.org/debian ;;
+	bpi0|cbxi4*|hb0|wbq0|odxu4*|wbd0|rpi2*|ff2*|opi2*)	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 ab3ac9a5..30fcc2e1 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|rpi2*|ff2*|opi2*)	MIRRORSITE=http://ftp.us.debian.org/debian ;;
+	bpi0|cbxi4*|hb0|wbq0|odxu4*|wbd0|rpi2*|ff2*|opi2*)	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 ab3ac9a5..30fcc2e1 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|rpi2*|ff2*|opi2*)	MIRRORSITE=http://ftp.us.debian.org/debian ;;
+	bpi0|cbxi4*|hb0|wbq0|odxu4*|wbd0|rpi2*|ff2*|opi2*)	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 83de14a1..6585239f 100644
--- a/hosts/jenkins/etc/munin/munin.conf
+++ b/hosts/jenkins/etc/munin/munin.conf
@@ -228,6 +228,16 @@ contact.me.command mail -s "Munin notification ${var:host}" root
     diskstats_utilization.graph no
     diskstats_iops.graph no
 
+[cbxi4a-armhf-rb.debian.net]
+    address ssh://jenkins@cbxi4a-armhf-rb.debian.net:2239/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
+
 [cbxi4pro0-armhf-rb.debian.net]
     address ssh://jenkins@cbxi4pro0-armhf-rb.debian.net:2226/bin/nc localhost 4949
     use_node_name yes
@@ -388,5 +398,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 ff2b-armhf-rb.debian.net hb0-armhf-rb.debian.net odxu4-armhf-rb.debian.net odxu4b-armhf-rb.debian.net odxu4c-armhf-rb.debian.net opi2a-armhf-rb.debian.net opi2b-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
+	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 cbxi4a-armhf-rb.debian.net cbxi4pro0-armhf-rb.debian.net ff2a-armhf-rb.debian.net ff2b-armhf-rb.debian.net hb0-armhf-rb.debian.net odxu4-armhf-rb.debian.net odxu4b-armhf-rb.debian.net odxu4c-armhf-rb.debian.net opi2a-armhf-rb.debian.net opi2b-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 ab3ac9a5..30fcc2e1 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|rpi2*|ff2*|opi2*)	MIRRORSITE=http://ftp.us.debian.org/debian ;;
+	bpi0|cbxi4*|hb0|wbq0|odxu4*|wbd0|rpi2*|ff2*|opi2*)	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 ab3ac9a5..30fcc2e1 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|rpi2*|ff2*|opi2*)	MIRRORSITE=http://ftp.us.debian.org/debian ;;
+	bpi0|cbxi4*|hb0|wbq0|odxu4*|wbd0|rpi2*|ff2*|opi2*)	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 ab3ac9a5..30fcc2e1 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|rpi2*|ff2*|opi2*)	MIRRORSITE=http://ftp.us.debian.org/debian ;;
+	bpi0|cbxi4*|hb0|wbq0|odxu4*|wbd0|rpi2*|ff2*|opi2*)	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 ab3ac9a5..30fcc2e1 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|rpi2*|ff2*|opi2*)	MIRRORSITE=http://ftp.us.debian.org/debian ;;
+	bpi0|cbxi4*|hb0|wbq0|odxu4*|wbd0|rpi2*|ff2*|opi2*)	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/opi2a-armhf-rb/etc/pbuilderrc b/hosts/opi2a-armhf-rb/etc/pbuilderrc
index ab3ac9a5..30fcc2e1 100644
--- a/hosts/opi2a-armhf-rb/etc/pbuilderrc
+++ b/hosts/opi2a-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|rpi2*|ff2*|opi2*)	MIRRORSITE=http://ftp.us.debian.org/debian ;;
+	bpi0|cbxi4*|hb0|wbq0|odxu4*|wbd0|rpi2*|ff2*|opi2*)	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/opi2b-armhf-rb/etc/pbuilderrc b/hosts/opi2b-armhf-rb/etc/pbuilderrc
index ab3ac9a5..30fcc2e1 100644
--- a/hosts/opi2b-armhf-rb/etc/pbuilderrc
+++ b/hosts/opi2b-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|rpi2*|ff2*|opi2*)	MIRRORSITE=http://ftp.us.debian.org/debian ;;
+	bpi0|cbxi4*|hb0|wbq0|odxu4*|wbd0|rpi2*|ff2*|opi2*)	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 ab3ac9a5..30fcc2e1 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|rpi2*|ff2*|opi2*)	MIRRORSITE=http://ftp.us.debian.org/debian ;;
+	bpi0|cbxi4*|hb0|wbq0|odxu4*|wbd0|rpi2*|ff2*|opi2*)	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 ab3ac9a5..30fcc2e1 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|rpi2*|ff2*|opi2*)	MIRRORSITE=http://ftp.us.debian.org/debian ;;
+	bpi0|cbxi4*|hb0|wbq0|odxu4*|wbd0|rpi2*|ff2*|opi2*)	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-build3-amd64/etc/pbuilderrc b/hosts/profitbricks-build3-amd64/etc/pbuilderrc
index ab3ac9a5..30fcc2e1 100644
--- a/hosts/profitbricks-build3-amd64/etc/pbuilderrc
+++ b/hosts/profitbricks-build3-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|rpi2*|ff2*|opi2*)	MIRRORSITE=http://ftp.us.debian.org/debian ;;
+	bpi0|cbxi4*|hb0|wbq0|odxu4*|wbd0|rpi2*|ff2*|opi2*)	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-build4-amd64/etc/pbuilderrc b/hosts/profitbricks-build4-amd64/etc/pbuilderrc
index ab3ac9a5..30fcc2e1 100644
--- a/hosts/profitbricks-build4-amd64/etc/pbuilderrc
+++ b/hosts/profitbricks-build4-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|rpi2*|ff2*|opi2*)	MIRRORSITE=http://ftp.us.debian.org/debian ;;
+	bpi0|cbxi4*|hb0|wbq0|odxu4*|wbd0|rpi2*|ff2*|opi2*)	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 30764b37..8d6936f7 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|rpi2*|ff2*|opi2*)	MIRRORSITE=http://ftp.us.debian.org/debian ;;
+	bpi0|cbxi4*|hb0|wbq0|odxu4*|wbd0|rpi2*|ff2*|opi2*)	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 30764b37..8d6936f7 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|rpi2*|ff2*|opi2*)	MIRRORSITE=http://ftp.us.debian.org/debian ;;
+	bpi0|cbxi4*|hb0|wbq0|odxu4*|wbd0|rpi2*|ff2*|opi2*)	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/pbuilderrc b/hosts/rpi2b-armhf-rb/etc/pbuilderrc
index ab3ac9a5..30fcc2e1 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|rpi2*|ff2*|opi2*)	MIRRORSITE=http://ftp.us.debian.org/debian ;;
+	bpi0|cbxi4*|hb0|wbq0|odxu4*|wbd0|rpi2*|ff2*|opi2*)	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/rpi2c-armhf-rb/etc/pbuilderrc b/hosts/rpi2c-armhf-rb/etc/pbuilderrc
index ab3ac9a5..30fcc2e1 100644
--- a/hosts/rpi2c-armhf-rb/etc/pbuilderrc
+++ b/hosts/rpi2c-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|rpi2*|ff2*|opi2*)	MIRRORSITE=http://ftp.us.debian.org/debian ;;
+	bpi0|cbxi4*|hb0|wbq0|odxu4*|wbd0|rpi2*|ff2*|opi2*)	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/wbd0-armhf-rb/etc/pbuilderrc b/hosts/wbd0-armhf-rb/etc/pbuilderrc
index ab3ac9a5..30fcc2e1 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|rpi2*|ff2*|opi2*)	MIRRORSITE=http://ftp.us.debian.org/debian ;;
+	bpi0|cbxi4*|hb0|wbq0|odxu4*|wbd0|rpi2*|ff2*|opi2*)	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 ab3ac9a5..30fcc2e1 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|rpi2*|ff2*|opi2*)	MIRRORSITE=http://ftp.us.debian.org/debian ;;
+	bpi0|cbxi4*|hb0|wbq0|odxu4*|wbd0|rpi2*|ff2*|opi2*)	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 d1eee4dc..c23b2436 100644
--- a/job-cfg/reproducible.yaml
+++ b/job-cfg/reproducible.yaml
@@ -259,6 +259,7 @@
                     my_timed: '5 0,3,6,9,12,15,18,21 * * *'
             my_hname:
                 - 'bpi0':           { my_arch: 'armhf' }
+                - 'cbxi4a':         { my_arch: 'armhf' }
                 - 'cbxi4pro0':      { my_arch: 'armhf' }
                 - 'ff2a':           { my_arch: 'armhf' }
                 - 'ff2b':           { my_arch: 'armhf' }
@@ -301,6 +302,7 @@
                     my_timed: '40 1 * * *'
             my_hname:
                 - 'bpi0':           { my_arch: 'armhf' }
+                - 'cbxi4a':         { my_arch: 'armhf' }
                 - 'cbxi4pro0':      { my_arch: 'armhf' }
                 - 'ff2a':           { my_arch: 'armhf' }
                 - 'ff2b':           { my_arch: 'armhf' }
@@ -468,7 +470,7 @@
 
         # could have all archs in one block, but it seems cleaner this way
         # to choose new jobs:
-        #       for i in wbq0 cbxi4pro0 ff2a ff2b odxu4 odxu4b odxu4c opi2a opi2b rpi2b rpi2c bpi0 hb0 wbd0 ; do echo "$i: " ; grep my_node1 job-cfg/reproducible.yaml|grep armhf|grep $i-armhf ; echo ; done
+        #       for i in wbq0 cbxi4a cbxi4pro0 ff2a ff2b odxu4 odxu4b odxu4c opi2a opi2b rpi2b rpi2c bpi0 hb0 wbd0 ; do echo "$i: " ; grep my_node1 job-cfg/reproducible.yaml|grep armhf|grep $i-armhf ; echo ; done
         - '{name}_builder_{my_arch}_{my_num}':
             my_description: 'Try to reproducibly build a scheduled package. This is one of several builder jobs.'
             my_arch: 'armhf'