From 683f48302fa6188dcb49bbbcdfeac83ecef9a43c Mon Sep 17 00:00:00 2001
From: Holger Levsen <holger@layer-acht.org>
Date: Thu, 22 Dec 2016 20:25:34 +0100
Subject: reproducible Debian: add arm64 to tested architectures, thanks to
 codethink.co.uk providing us with 8 moonshot arm64 sleds

Signed-off-by: Holger Levsen <holger@layer-acht.org>
---
 bin/common-functions.sh            |  4 +++-
 bin/jenkins_node_definitions.sh    | 33 ++++++++++++++++++++++++++++++++-
 bin/reproducible_build.sh          |  5 ++++-
 bin/reproducible_common.py         |  2 +-
 bin/reproducible_common.sh         |  2 +-
 bin/reproducible_html_dashboard.sh |  2 +-
 6 files changed, 42 insertions(+), 6 deletions(-)

(limited to 'bin')

diff --git a/bin/common-functions.sh b/bin/common-functions.sh
index 579c8637..d98f35db 100755
--- a/bin/common-functions.sh
+++ b/bin/common-functions.sh
@@ -107,6 +107,8 @@ else
 				export MIRROR=http://ftp.de.debian.org/debian ;;
 			bbx15|bpi0|cb3*|cbxi4*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*)
 				export MIRROR=http://ftp.us.debian.org/debian ;;
+			codethink*)
+				export MIRROR=http://ftp.uk.debian.org/debian ;;
 			spectrum)
 				export MIRROR=none ;;
 			*)
@@ -115,7 +117,7 @@ else
 	fi
 	if [ -z "$http_proxy" ]; then
 		case $HOSTNAME in
-			jenkins|jenkins-test-vm|profitbricks-build*)
+			jenkins|jenkins-test-vm|profitbricks-build*|codethink*)
 				export http_proxy="http://localhost:3128" ;;
 			bbx15|bpi0|cb3*|cbxi4*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*)
 				export http_proxy="http://10.0.0.15:8000/" ;;
diff --git a/bin/jenkins_node_definitions.sh b/bin/jenkins_node_definitions.sh
index c177a1e3..f83b1e1f 100755
--- a/bin/jenkins_node_definitions.sh
+++ b/bin/jenkins_node_definitions.sh
@@ -40,7 +40,15 @@ ff4a-armhf-rb.debian.net
 jtk1a-armhf-rb.debian.net
 opi2a-armhf-rb.debian.net
 opi2b-armhf-rb.debian.net
-opi2c-armhf-rb.debian.net"
+opi2c-armhf-rb.debian.net
+codethink-sled9-arm64.debian.net
+codethink-sled10-arm64.debian.net
+codethink-sled11-arm64.debian.net
+codethink-sled12-arm64.debian.net
+codethink-sled13-arm64.debian.net
+codethink-sled14-arm64.debian.net
+codethink-sled15-arm64.debian.net
+codethink-sled16-arm64.debian.net"
 
 # return the ports sshd is listening on
 get_node_ssh_port() {
@@ -114,6 +122,29 @@ get_node_ssh_port() {
 	    ;;
 	  profitbricks-build*)
 	    PORT=22
+	  codethink-sled9*)
+	    PORT=10109
+	    ;;
+	  codethink-sled10*)
+	    PORT=10110
+	    ;;
+	  codethink-sled11*)
+	    PORT=10111
+	    ;;
+	  codethink-sled12*)
+	    PORT=10112
+	    ;;
+	  codethink-sled13*)
+	    PORT=10113
+	    ;;
+	  codethink-sled14*)
+	    PORT=10114
+	    ;;
+	  codethink-sled15*)
+	    PORT=10115
+	    ;;
+	  codethink-sled16*)
+	    PORT=10116
 	    ;;
 	  *)
 	    echo >&2 "Unknown node $NODE_NAME."
diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh
index 8eb78362..bc97cf2d 100755
--- a/bin/reproducible_build.sh
+++ b/bin/reproducible_build.sh
@@ -588,7 +588,7 @@ check_suitability() {
 			break
 		fi
 		# special case arm…
-		if [ "$ARCH" = "armhf" ] && [ "$arch" = "any-arm" ] ; then
+		if ( [ "$ARCH" = "armhf" ] || "$ARCH" = "arm64" ] ) && [ "$arch" = "any-arm" ] ; then
 			SUITABLE=true
 			break
 		fi
@@ -657,6 +657,9 @@ second_build() {
 		armhf)	locale=it_CH
 			language=it
 			;;
+		arm64)	locale=nl_BE
+			language=nl
+			;;
 		i386)	locale=de_CH
 			language=de
 			;;
diff --git a/bin/reproducible_common.py b/bin/reproducible_common.py
index 94075595..50ca6e93 100755
--- a/bin/reproducible_common.py
+++ b/bin/reproducible_common.py
@@ -41,7 +41,7 @@ if os.uname()[1] == 'jenkins-test-vm':
 # tested suites
 SUITES = ['testing', 'unstable', 'experimental']
 # tested architectures
-ARCHS = ['amd64', 'i386', 'armhf']
+ARCHS = ['amd64', 'i386', 'arm64', 'armhf']
 # defaults
 defaultsuite = 'unstable'
 defaultarch = 'amd64'
diff --git a/bin/reproducible_common.sh b/bin/reproducible_common.sh
index 2a618b04..1220ccda 100755
--- a/bin/reproducible_common.sh
+++ b/bin/reproducible_common.sh
@@ -34,7 +34,7 @@ TEMPLATE_PATH=/srv/jenkins/mustache-templates/reproducible
 # Debian suites being tested
 SUITES="testing unstable experimental"
 # Debian architectures being tested
-ARCHS="amd64 i386 armhf"
+ARCHS="amd64 i386 arm64 armhf"
 
 # define Debian build nodes in use
 . /srv/jenkins/bin/jenkins_node_definitions.sh
diff --git a/bin/reproducible_html_dashboard.sh b/bin/reproducible_html_dashboard.sh
index 5435467d..7cdc227a 100755
--- a/bin/reproducible_html_dashboard.sh
+++ b/bin/reproducible_html_dashboard.sh
@@ -432,7 +432,7 @@ create_suite_arch_stats_page() {
 	fi
 	set_icon not_for_us
 	write_icon
-	if [ "$ARCH" = "armhf" ] ; then
+	if [ "$ARCH" = "armhf" ] || [ "$ARCH" = "arm64" ]; then
 		ARMSPECIALARCH=" 'any-arm',"
 	fi
 	write_page "$COUNT_NOTFORUS ($PERCENT_NOTFORUS%) packages which are neither Architecture: 'any', 'all', '$ARCH', 'linux-any', 'linux-$ARCH'$ARMSPECIALARCH nor 'any-$ARCH' will not be build here"
-- 
cgit v1.2.3-70-g09d2