[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] jenkins nodes: correct assumption that armhf nodes are named -armhf, fixup 7f678202f

[Holger Levsen (@holger)]

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


Commits:
d321fcd0 by Holger Levsen at 2023-06-13T17:10:03+02:00
jenkins nodes: correct assumption that armhf nodes are named -armhf, fixup 7f678202f

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

- - - - -


1 changed file:

- update_jdn.sh


Changes:

=====================================
update_jdn.sh
=====================================
@@ -376,21 +376,6 @@ if [ -f /etc/debian_version ] ; then
 				linux-image-generic
 				monitoring-plugins-contrib/buster-backports
 				" ;;
-			*i386|*amd64|*armhf)	# running Debian bookworm already
-				DEBS="$DEBS
-				btop
-				fasttrack-archive-keyring
-				foot-terminfo
-				ripgrep
-				lz4
-				monitoring-plugins-contrib
-				mmdebstrap
-				munin-node
-				munin-plugins-core
-				munin-plugins-extra
-				ntpsec
-				devscripts
-				" ;;
 			rb-mail*)	# is still running Debian buster because of python2
 				DEBS="$DEBS
 				bind9-dnsutils/buster-backports
@@ -404,7 +389,7 @@ if [ -f /etc/debian_version ] ; then
 				munin-plugins-extra/buster-backports
 				devscripts/buster-backports
 				" ;;
-			*)	# packages to be installed on all Debian systems but which are not available in Ubuntu 18.04:
+			jenkins) # packages to be installed on bullseye Debian systems but which are not available in Ubuntu 18.04:
 				DEBS="$DEBS
 				bind9-dnsutils
 				btop/bullseye-backports
@@ -420,6 +405,22 @@ if [ -f /etc/debian_version ] ; then
 				devscripts/bullseye-backports
 				debootstrap/bullseye-backports
 				" ;;
+			*)	# packages to be installed on bookworm Debian systems but which are not available in Ubuntu 18.04:
+running Debian bookworm already
+				DEBS="$DEBS
+				btop
+				fasttrack-archive-keyring
+				foot-terminfo
+				ripgrep
+				lz4
+				monitoring-plugins-contrib
+				mmdebstrap
+				munin-node
+				munin-plugins-core
+				munin-plugins-extra
+				ntpsec
+				devscripts
+				" ;;
 		esac
 		case $HOSTNAME in
 			# needed for rebuilding Debian (using .buildinfo files)



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

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/d321fcd0799377e01b2aa2d421b1704da2e6beb2
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/20230613/6f444226/attachment-0001.htm>