reproducible armhf: add new armhf node, thanks to Vagrant

23 files changed, 33 insertions, 23 deletions

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