[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] updates for all debian hosts, except jenkins, running bullseye now (thus not...

[Holger Levsen (@holger)]

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


Commits:
dcf75a57 by Holger Levsen at 2021-08-17T20:17:38+02:00
updates for all debian hosts, except jenkins, running bullseye now (thus not needing buster-backports anymore)

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

- - - - -


1 changed file:

- update_jdn.sh


Changes:

=====================================
update_jdn.sh
=====================================
@@ -367,16 +367,11 @@ if [ -f /etc/debian_version ] ; then
 		esac
 		# special case buster-backports:
 		case $HOSTNAME in
-			ionos7*|osuosl167*)
-				# these nodes also run bullseye and thus don't have buster-backports as the rest
-				;;
-			jenkins|*amd64*|*i386*)
+			jenkins)
 				DEBS="$DEBS
 				devscripts/buster-backports
 				" ;;
-			*)
-				# armhf is already running bullseye and arm64 is Ubuntu...
-				;;
+			*)	;;
 		esac
 		case $HOSTNAME in
 			# needed for rebuilding Debian (using .buildinfo files)
@@ -658,7 +653,7 @@ if [ -f /etc/debian_version ] ; then
 		# - this is done as a seperate step as bpo kernels are frequently uninstallable when upgraded on bpo
 		if [ "$HOSTNAME" = "ionos5-amd64" ] || [ "$HOSTNAME" = "ionos15-amd64" ] \
 			|| [ "$HOSTNAME" = "osuosl172-amd64" ] ; then
-			sudo apt install linux-image-amd64/buster-backports || true # backport kernels are frequently uninstallable...
+			sudo apt install linux-image-amd64/bullseye-backports || true # backport kernels are frequently uninstallable...
 			:
 		elif [ "$HOSTNAME" = "ionos6-i386" ] || [ "$HOSTNAME" = "ionos16-i386" ] ; then
 			# run with the amd64 kernel in these i386 nodes
@@ -668,7 +663,7 @@ if [ -f /etc/debian_version ] ; then
 			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...
+			sudo apt install linux-image-amd64/bullseye-backports || true # backport kernels are frequently uninstallable...
 			:
 		fi
 		# don't (re-)install pbuilder if it's on hold



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

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/dcf75a57f0deb870c4783ab2326f4742df46c27c
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/20210817/a587d148/attachment-0001.htm>