[Git][qa/jenkins.debian.net][master] upgrade jenkins host to bookworm, more changes

[Holger Levsen (@holger)]

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


Commits:
a790b6ea by Holger Levsen at 2023-07-22T20:10:49+02:00
upgrade jenkins host to bookworm, more changes

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

- - - - -


2 changed files:

- init_node
- update_jdn.sh


Changes:

=====================================
init_node
=====================================
@@ -30,7 +30,6 @@ adduser --system --shell /bin/bash --home /home/jenkins-adm --ingroup jenkins-ad
 usermod -G jenkins jenkins-adm
 which sudo || apt-get install -y sudo
 echo '%jenkins-adm ALL= NOPASSWD: ALL' > /etc/sudoers.d/jenkins-adm # will be overwritten later
-grep -q bullseye-backports /etc/apt/sources.list || echo "deb http://deb.debian.org/debian/ bullseye-backports main contrib non-free" >> /etc/apt/sources.list
 chown jenkins-adm:jenkins-adm /home/jenkins-adm
 cd ~jenkins-adm
 # the keyring is needed as otherwise update_jdn will fail later


=====================================
update_jdn.sh
=====================================
@@ -371,22 +371,6 @@ if [ -f /etc/debian_version ] ; then
 				munin-plugins-extra/buster-backports
 				devscripts/buster-backports
 				" ;;
-			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
-				fasttrack-archive-keyring
-				foot-terminfo
-				ripgrep
-				lz4
-				monitoring-plugins-contrib/bullseye-backports
-				mmdebstrap
-				munin-node/bullseye-backports
-				munin-plugins-core/bullseye-backports
-				munin-plugins-extra/bullseye-backports
-				devscripts/bullseye-backports
-				debootstrap/bullseye-backports
-				" ;;
 			*)	# packages to be installed on bookworm Debian systems but which are not available in Ubuntu 18.04:
 				DEBS="$DEBS
 				btop
@@ -552,8 +536,6 @@ if [ -f /etc/debian_version ] ; then
 		#fi
 		# only on main node
 		if [ "$HOSTNAME" = "jenkins" ] ; then
-			# required by _db_backup, but not available in bullseye.  https://bugs.debian.org/970870
-			#postgresql-autodoc
 			MASTERDEBS=" 
 				apache2 
 				apt-file 
@@ -593,7 +575,7 @@ if [ -f /etc/debian_version ] ; then
 				moreutils 
 				mr 
 				mtr-tiny 
-				munin/bullseye-backports
+				munin
 				ntp
 				obfs4proxy
 				openbios-ppc 
@@ -603,6 +585,7 @@ if [ -f /etc/debian_version ] ; then
 				po4a
 				postgresql
 				postgresql-client
+				postgresql-autodoc
 				poxml 
 				procmail 
 				python3-debian 
@@ -648,7 +631,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" = "osuosl2-amd64" ] ; then
-			sudo apt install linux-image-amd64/bullseye-backports || true # backport kernels are frequently uninstallable...
+			sudo apt install linux-image-amd64/bookworm-backports || true # backport kernels are frequently uninstallable...
 			:
 		elif [ "$HOSTNAME" = "ionos6-i386" ] || [ "$HOSTNAME" = "ionos16-i386" ] ; then
 			# run with the amd64 kernel in these i386 nodes
@@ -658,7 +641,7 @@ if [ -f /etc/debian_version ] ; then
 			sudo apt install linux-image-686-pae linux-image-amd64-
 		elif [ "$HOSTNAME" = "osuosl1-amd64" ] || [ "$HOSTNAME" = "osuosl2-amd64" ] ; then
 			# Arch Linux builds latest stuff which sometimes (eg, currently Qt) needs newer kernel to build...
-			#sudo apt install linux-image-amd64/bullseye-backports || true # backport kernels are frequently uninstallable...
+			sudo apt install linux-image-amd64/bookworm-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/a790b6ea9fc28f83ca4a1ceef4019c6e9d7ee4cd

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