[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] reproducible debian: properly alternate amd64 and 686 kernels in the i386 builders

[Mattia Rizzolo]

Mattia Rizzolo pushed to branch master at Debian QA / jenkins.debian.net


Commits:
44cae15f by Mattia Rizzolo at 2021-05-02T22:37:25+02:00
reproducible debian: properly alternate amd64 and 686 kernels in the i386 builders

it's already this way, as apparently they are running the correct
kernel, but just don't try to install the amd64 kernel where we don't
need it

Signed-off-by: Mattia Rizzolo <mattia at debian.org>

- - - - -


1 changed file:

- update_jdn.sh


Changes:

=====================================
update_jdn.sh
=====================================
@@ -650,10 +650,12 @@ if [ -f /etc/debian_version ] ; then
 			|| [ "$HOSTNAME" = "osuosl172-amd64" ] ; then
 			sudo apt install linux-image-amd64/buster-backports || true # backport kernels are frequently uninstallable...
 			:
-		elif [ "$HOSTNAME" = "ionos6-i386" ] || [ "$HOSTNAME" = "ionos16-i386" ] \
-			|| [ "$HOSTNAME" = "ionos2-i386" ] || [ "$HOSTNAME" = "ionos12-i386" ] ; then
-			# we dont vary the kernel on i386 atm, see #875990 + #876035
-			sudo apt install linux-image-amd64:amd64
+		elif [ "$HOSTNAME" = "ionos6-i386" ] || [ "$HOSTNAME" = "ionos16-i386" ] ; then
+			# run with the amd64 kernel in these i386 nodes
+			sudo apt install linux-image-amd64 linux-image-686-pae-
+		elif [ "$HOSTNAME" = "ionos2-i386" ] || [ "$HOSTNAME" = "ionos12-i386" ] ; then
+			# run with the i386 kernel in these i386 nodes
+			sudo apt install linux-image-686-pae linux-image-amd64-
 		elif [ "$HOSTNAME" = "osuosl169-amd64" ] || [ "$HOSTNAME" = "osuosl170-amd64" ] || [ "$HOSTNAME" = "osuosl173-amd64" ]; then
 			# Arch Linux builds latest stuff which sometimes (eg, currentlt Qt) needs newer kernel to build...
 			sudo apt install linux-image-amd64/buster-backports || true # backport kernels are frequently uninstallable...



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/44cae15f4e99b8a86b1b1c84ace48623abd453b4

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/44cae15f4e99b8a86b1b1c84ace48623abd453b4
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/20210502/18c7496e/attachment-0001.htm>