[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] reproducible Debian: use amd64 kernels on all i386 nodes (Closes: #875990

[Holger Levsen]

Holger Levsen pushed to branch master at Debian QA / jenkins.debian.net


Commits:
0fef9342 by Holger Levsen at 2018-09-10T20:48:28Z
reproducible Debian: use amd64 kernels on all i386 nodes (Closes: #875990

Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -


3 changed files:

- − hosts/profitbricks-build12-i386/etc/apt/sources.list
- − hosts/profitbricks-build2-i386/etc/apt/sources.list
- update_jdn.sh


Changes:

=====================================
hosts/profitbricks-build12-i386/etc/apt/sources.list deleted
=====================================
@@ -1,15 +0,0 @@
-deb http://deb.debian.org/debian/ stretch main contrib non-free
-#deb-src http://deb.debian.org/debian/ stretch main contrib non-free
-
-deb http://deb.debian.org/debian/ stretch-updates main contrib non-free
-#deb-src http://deb.debian.org/debian/ stretch-updates main contrib non-free
-
-deb http://security.debian.org/ stretch/updates main contrib non-free
-#deb-src http://security.debian.org/ stretch/updates main contrib non-free
-
-deb http://deb.debian.org/debian/ stretch-backports main contrib non-free
-#deb-src http://deb.debian.org/debian/ stretch-backports main contrib non-free
-
-# workaround for i386 kernel bugs #875990 + #876035
-deb http://deb.debian.org/debian-security jessie/updates main
-deb http://deb.debian.org/debian jessie main


=====================================
hosts/profitbricks-build2-i386/etc/apt/sources.list deleted
=====================================
@@ -1,15 +0,0 @@
-deb http://deb.debian.org/debian/ stretch main contrib non-free
-#deb-src http://deb.debian.org/debian/ stretch main contrib non-free
-
-deb http://deb.debian.org/debian/ stretch-updates main contrib non-free
-#deb-src http://deb.debian.org/debian/ stretch-updates main contrib non-free
-
-deb http://security.debian.org/ stretch/updates main contrib non-free
-#deb-src http://security.debian.org/ stretch/updates main contrib non-free
-
-deb http://deb.debian.org/debian/ stretch-backports main contrib non-free
-#deb-src http://deb.debian.org/debian/ stretch-backports main contrib non-free
-
-# workaround for i386 kernel bugs #875990 + #876035
-deb http://deb.debian.org/debian-security jessie/updates main
-deb http://deb.debian.org/debian jessie main


=====================================
update_jdn.sh
=====================================
@@ -469,11 +469,12 @@ if [ -f /etc/debian_version ] ; then
 			$UP2DATE || sudo apt-get install mock
 		fi
 		# for varying kernels:
-		# - we use bpo kernels on pb-build5+15 (and the default i386 kernel on pb-build2+12-i386)
-		# - we use the default amd64 kernel on pb-build1+11 (and the default amd64 kernel on pb-build6+16-i386)
+		# - we use bpo kernels on pb-build5+15 (and the default amd64 kernel on pb-build6+16-i386)
 		if [ "$HOSTNAME" = "profitbricks-build5-amd64" ] || [ "$HOSTNAME" = "profitbricks-build15-amd64" ] ; then
 			$UP2DATE || sudo apt-get install -t stretch-backports linux-image-amd64
-		elif [ "$HOSTNAME" = "profitbricks-build6-i386" ] || [ "$HOSTNAME" = "profitbricks-build16-i386" ] ; then
+		elif [ "$HOSTNAME" = "profitbricks-build6-i386" ] || [ "$HOSTNAME" = "profitbricks-build16-i386" ] \
+			|| [ "$HOSTNAME" = "profitbricks-build2-i386" ] || [ "$HOSTNAME" = "profitbricks-build12-i386" ] ; then
+			# we dont vary the kernel on i386 atm, see #875990 + #876035
 			$UP2DATE || sudo apt-get install linux-image-amd64
 		fi
 		# only needed on the main nodes



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/commit/0fef93423e8f485a5d2c866b86191c859c6787a4

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/commit/0fef93423e8f485a5d2c866b86191c859c6787a4
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/qa-jenkins-scm/attachments/20180910/66ab1734/attachment-0001.html>