[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] refactoring/cleanup (and fix one non-match

[Holger Levsen (@holger)]

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


Commits:
479a5a5f by Holger Levsen at 2022-12-30T18:55:41+01:00
refactoring/cleanup (and fix one non-match

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

- - - - -


1 changed file:

- update_jdn.sh


Changes:

=====================================
update_jdn.sh
=====================================
@@ -367,7 +367,7 @@ if [ -f /etc/debian_version ] ; then
 				linux-image-generic
 				monitoring-plugins-contrib/buster-backports
 				" ;;
-			osuosl168)	# is running Debian bookworm already
+			osuosl168*)	# is running Debian bookworm already
 				DEBS="$DEBS
 				btop
 				fasttrack-archive-keyring
@@ -398,11 +398,11 @@ if [ -f /etc/debian_version ] ; then
 		esac
 		case $HOSTNAME in
 			# needed for rebuilding Debian (using .buildinfo files)
-			osuosl173-amd64) DEBS="$DEBS libdpkg-perl libwww-mechanize-perl sbuild" 
+			osuosl173*) DEBS="$DEBS libdpkg-perl libwww-mechanize-perl sbuild" 
 					 DEBS="$DEBS live-build"	# needed for live-build
 					 DEBS="$DEBS cdebootstrap cdebootstrap-static" ;; 	# needed for testing just that
 			# needed for opensuse openbuildservice
-			osuosl174-amd64) DEBS="$DEBS osc obs-build qemu-kvm libarchive-tools libjson-perl libxml-simple-perl" ;;
+			osuosl174*) DEBS="$DEBS osc obs-build qemu-kvm libarchive-tools libjson-perl libxml-simple-perl" ;;
 			*) ;;
 		esac
 		# install stuff for bremner's builtin-pho stuff
@@ -435,7 +435,7 @@ if [ -f /etc/debian_version ] ; then
 		esac
 		# notifications are only done from a few nodes
 		case $HOSTNAME in
-			jenkins|ionos*|osuosl167-amd64) DEBS="$DEBS
+			jenkins|ionos*|osuosl167*) DEBS="$DEBS
 				kgb-client
 				python3-yaml" ;;
 			*) ;;
@@ -444,12 +444,12 @@ if [ -f /etc/debian_version ] ; then
 		case $HOSTNAME in
 			ionos5-amd64|ionos6-i386|ionos15-amd64|ionos16-i386) DEBS="$DEBS ntpdate" ;;
 			codethink9*|codethink11*|codethink13*|codethink15*) DEBS="$DEBS ntpdate" ;;
-			osuosl170-amd64|osuosl172-amd64) DEBS="$DEBS ntpdate" ;;
+			osuosl170*|osuosl172*) DEBS="$DEBS ntpdate" ;;
 			*) ;;
 		esac
 		# needed to run coreboot/openwrt/netbsd/fedora jobs
 		case $HOSTNAME in
-		osuosl171-amd64|osuosl172-amd64) DEBS="$DEBS
+		osuosl171*|osuosl172*) DEBS="$DEBS
 				bison
 				ca-certificates
 				cmake
@@ -485,7 +485,7 @@ if [ -f /etc/debian_version ] ; then
 			*) ;;
 		esac
 		case $HOSTNAME in
-		osuosl167-amd64|osuosl168-amd64)
+		osuosl167*|osuosl168*)
 			DEBS="$DEBS openqa-worker"
 			;;
 		jenkins)



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

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/479a5a5ff6decf0cff7b99cc45cb09f37820af1b
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/20221230/882261e8/attachment-0001.htm>