add new armhf node, Odroid-XU4, thanks to vagrant

15 files changed, 60 insertions, 15 deletions

diff --git a/THANKS.head b/THANKS.head
index 151a2867..2d1e6b0b 100644
--- a/THANKS.head
+++ b/THANKS.head
@@ -12,7 +12,7 @@
  ** 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 four 'armhf' systems, two quad-cores with 2 GB RAM each and two dual-cores with 1 GB RAM.
+ * link:https://qa.debian.org/developer.php?login=vagrant%40debian.org[Vagrant] is kindly providing and hosting five 'armhf' systems, three quad-cores with 2 GB RAM each and two dual-cores with 1 GB RAM.
 
 === Contributors
 
diff --git a/bin/common-functions.sh b/bin/common-functions.sh
index 830316e3..660fe061 100755
--- a/bin/common-functions.sh
+++ b/bin/common-functions.sh
@@ -57,14 +57,14 @@ else
 	if [ -z "$MIRROR" ]; then
 		case $HOSTNAME in
 			jenkins|profitbricks-build?-amd64)	export MIRROR=http://ftp.de.debian.org/debian ;;
-			bpi0|cbxi4pro0|hb0|wbq0)		export MIRROR=http://ftp.us.debian.org/debian ;;
+			bpi0|cbxi4pro0|hb0|wbq0|odxu4)		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|profitbricks-build?-amd64)	export http_proxy="http://localhost:3128" ;;
-			bpi0|cbxi4pro0|hb0|wbq0)		export http_proxy="http://10.0.0.15:8000/" ;;
+			bpi0|cbxi4pro0|hb0|wbq0|odxu4)		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 b8d08e4c..e08e4da7 100755
--- a/bin/jenkins_master_wrapper.sh
+++ b/bin/jenkins_master_wrapper.sh
@@ -18,6 +18,9 @@ case "$NODE_NAME" in
   cbxi4pro0-armhf-rb.debian.net)
     PORT=2226
     ;;
+  odxu4-armhf-rb.debian.net)
+    PORT=2229
+    ;;
   profitbricks-build?-amd64.debian.net)
     PORT=22
     if [[ "$JOB_NAME" =~ rebootstrap_.* ]] ; then
diff --git a/bin/reproducible_common.sh b/bin/reproducible_common.sh
index 071a6576..babb8f21 100755
--- a/bin/reproducible_common.sh
+++ b/bin/reproducible_common.sh
@@ -46,7 +46,7 @@ SUITES="testing unstable experimental"
 ARCHS="armhf amd64"
 
 # define 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" # 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" # 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
@@ -333,7 +333,9 @@ write_explaination_table() {
 		write_page "<tr><td>env CAPTURE_ENVIRONMENT</td><td><em>not set</em></td><td>CAPTURE_ENVIRONMENT=\"I capture the environment\"</td></tr>"
 	fi
 	write_page "<tr><td>env TZ</td><td>TZ=\"/usr/share/zoneinfo/Etc/GMT+12\"</td><td>TZ=\"/usr/share/zoneinfo/Etc/GMT-14\"</td></tr>"
-	if [ "$1" = "Arch Linux" ]  ; then
+	if [ "$1" = "Debian" ]  ; then
+		write_page "<tr><td>env LANG</td><td>LANG<em>C</em></td><td>LANG=\"fr_CH.UTF-8\"</td></tr>"
+	elif [ "$1" = "Arch Linux" ]  ; then
 		write_page "<tr><td>env LANG</td><td>LANG<em>not set</em></td><td>LANG=\"fr_CH.UTF-8\"</td></tr>"
 	else
 		write_page "<tr><td>env LANG</td><td>LANG=\"en_GB.UTF-8\"</td><td>LANG=\"fr_CH.UTF-8\"</td></tr>"
diff --git a/hosts/bpi0-armhf-rb/etc/pbuilderrc b/hosts/bpi0-armhf-rb/etc/pbuilderrc
index 909a8829..f18457c2 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)		MIRRORSITE=http://ftp.us.debian.org/debian ;;
+	bpi0|cbxi4pro0|hb0|wbq0|odxu4)		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 909a8829..f18457c2 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)		MIRRORSITE=http://ftp.us.debian.org/debian ;;
+	bpi0|cbxi4pro0|hb0|wbq0|odxu4)		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 909a8829..f18457c2 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)		MIRRORSITE=http://ftp.us.debian.org/debian ;;
+	bpi0|cbxi4pro0|hb0|wbq0|odxu4)		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 04ba0831..b6ae3718 100644
--- a/hosts/jenkins/etc/munin/munin.conf
+++ b/hosts/jenkins/etc/munin/munin.conf
@@ -238,6 +238,16 @@ contact.me.command mail -s "Munin notification ${var:host}" qa-jenkins-scm@lists
     diskstats_utilization.graph no
     diskstats_iops.graph no
 
+[odxu4-armhf-rb.debian.net]
+    address ssh://jenkins@odxu4-armhf-rb.debian.net:2229/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
+
 [freebsd-jenkins.debian.net]
     address 46.16.73.236
     use_node_name yes
@@ -287,5 +297,5 @@ contact.me.command mail -s "Munin notification ${var:host}" qa-jenkins-scm@lists
 #       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 wbq0-armhf-rb.debian.net cbxi4pro0-armhf-rb.debian.net bpi0-armhf-rb.debian.net hb0-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 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 freebsd-jenkins.debian.net
 
diff --git a/hosts/jenkins/etc/pbuilderrc b/hosts/jenkins/etc/pbuilderrc
index 909a8829..f18457c2 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)		MIRRORSITE=http://ftp.us.debian.org/debian ;;
+	bpi0|cbxi4pro0|hb0|wbq0|odxu4)		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 909a8829..f18457c2 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)		MIRRORSITE=http://ftp.us.debian.org/debian ;;
+	bpi0|cbxi4pro0|hb0|wbq0|odxu4)		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 909a8829..f18457c2 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)		MIRRORSITE=http://ftp.us.debian.org/debian ;;
+	bpi0|cbxi4pro0|hb0|wbq0|odxu4)		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 909a8829..f18457c2 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)		MIRRORSITE=http://ftp.us.debian.org/debian ;;
+	bpi0|cbxi4pro0|hb0|wbq0|odxu4)		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 909a8829..f18457c2 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)		MIRRORSITE=http://ftp.us.debian.org/debian ;;
+	bpi0|cbxi4pro0|hb0|wbq0|odxu4)		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 909a8829..f18457c2 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)		MIRRORSITE=http://ftp.us.debian.org/debian ;;
+	bpi0|cbxi4pro0|hb0|wbq0|odxu4)		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 3ac24f90..8c742ffc 100644
--- a/job-cfg/reproducible.yaml
+++ b/job-cfg/reproducible.yaml
@@ -236,6 +236,10 @@
 
 - job-template:
     defaults: reproducible
+    name: '{name}_maintenance_armhf_odxu4'
+
+- job-template:
+    defaults: reproducible
     name: '{name}_maintenance_amd64_profitbricks1'
 
 - job-template:
@@ -288,6 +292,10 @@
 
 - job-template:
     defaults: reproducible
+    name: '{name}_setup_pbuilder_unstable_armhf_odxu4'
+
+- job-template:
+    defaults: reproducible
     name: '{name}_setup_pbuilder_testing_amd64_profitbricks1'
 
 - job-template:
@@ -368,6 +376,10 @@
 
 - job-template:
     defaults: reproducible
+    name: '{name}_setup_schroot_unstable_armhf_odxu4'
+
+- job-template:
+    defaults: reproducible
     name: '{name}_setup_schroot_testing_amd64_jenkins'
 
 - job-template:
@@ -699,6 +711,12 @@
             my_shell: '/srv/jenkins/bin/jenkins_master_wrapper.sh'
             my_recipients: 'qa-jenkins-scm@lists.alioth.debian.org'
             my_node: 'wbq0'
+        - '{name}_maintenance_armhf_odxu4':
+            my_description: 'Do some maintenance: check for old directories laying around, do backups, update pbuilder and schroots, etc.'
+            my_timed: '5 0,3,6,9,12,15,18,21 * * *'
+            my_shell: '/srv/jenkins/bin/jenkins_master_wrapper.sh'
+            my_recipients: 'qa-jenkins-scm@lists.alioth.debian.org'
+            my_node: 'odxu4'
         - '{name}_maintenance_amd64_profitbricks1':
             my_description: 'Do some maintenance: check for old directories laying around, do backups, update pbuilder and schroots, etc.'
             my_timed: '5 0,3,6,9,12,15,18,21 * * *'
@@ -753,6 +771,12 @@
             my_shell: '/srv/jenkins/bin/jenkins_master_wrapper.sh'
             my_recipients: 'qa-jenkins-scm@lists.alioth.debian.org'
             my_node: 'wbq0'
+        - '{name}_setup_pbuilder_unstable_armhf_odxu4':
+            my_description: 'Setup pbuilder for reproducible builds of packages from unstable as described in https://wiki.debian.org/ReproducibleBuilds#Usage_example'
+            my_timed: '42 7 * * *'
+            my_shell: '/srv/jenkins/bin/jenkins_master_wrapper.sh'
+            my_recipients: 'qa-jenkins-scm@lists.alioth.debian.org'
+            my_node: 'odxu4'
         - '{name}_setup_pbuilder_testing_amd64_profitbricks1':
             my_description: 'Setup pbuilder for reproducible builds of packages from testing as described in https://wiki.debian.org/ReproducibleBuilds#Usage_example'
             my_timed: '23 7 * * *'
@@ -897,6 +921,12 @@
             my_shell: '/srv/jenkins/bin/jenkins_master_wrapper.sh'
             my_recipients: 'qa-jenkins-scm@lists.alioth.debian.org'
             my_node: 'wbq0'
+        - '{name}_setup_schroot_unstable_armhf_odxu4':
+            my_description: 'Setup unstable schroot for fetching source packages for the builder jobs.'
+            my_timed: '42 1 * * *'
+            my_shell: '/srv/jenkins/bin/jenkins_master_wrapper.sh'
+            my_recipients: 'qa-jenkins-scm@lists.alioth.debian.org'
+            my_node: 'odxu4'
         - '{name}_setup_schroot_testing_amd64_jenkins':
             my_description: 'Setup testing schroot for fetching source packages for the builder jobs.'
             my_timed: '42 1 * * *'