[Git][qa/jenkins.debian.net][master] openqa: use version from backports

[Holger Levsen (@holger)]

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


Commits:
cf0cf589 by Philip Hands at 2025-11-02T12:32:11+01:00
openqa: use version from backports

This eliminates the need to use debian-fasttrack for workers.

This mainly reverts commit bf571b0df74e760db7d0f04d237337e381809a8a.

(cherry picked from commit 4b797655d0a1ea8132551dfd077b79cb8acf73d2)
Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -


1 changed file:

- update_jdn.sh


Changes:

=====================================
update_jdn.sh
=====================================
@@ -412,10 +412,6 @@ if [ -f /etc/debian_version ] ; then
 					# needed for testing just that
 					DEBS="$DEBS cdebootstrap cdebootstrap-static"
 					;;
-			osuosl31*)
-					# needed for openqa-worker
-					DEBS="$DEBS openqa-worker swtpm"
-					;;
 			osuosl1*)
 					# needed for live-build
 					DEBS="$DEBS live-build openqa-client"
@@ -510,15 +506,14 @@ if [ -f /etc/debian_version ] ; then
 		case $HOSTNAME in
 		osuosl31-amd64)
 			# openqa
-			PREDEBS="$PREDEBS
-				 fasttrack-archive-keyring"
 			DEBS="$DEBS
 				 apt-cacher-ng
 				 apt-show-versions
 				 nfs-common
-				 cachefilesd"
-			#	 openqa-worker/trixie-fasttrack
-			#	 os-autoinst/trixie-fasttrack
+				 cachefilesd
+				 openqa-worker/trixie-backports
+				 os-autoinst/trixie-backports
+				 swtpm"
 			sudo systemctl disable --now openqa-worker-cacheservice-minion.service || true
 			sudo systemctl disable --now openqa-worker-cacheservice.service || true
 			[ -d /var/lib/openqa/var_cache_fscache ] || sudo mkdir -p /var/lib/openqa/var_cache_fscache
@@ -682,7 +677,6 @@ if [ -f /etc/debian_version ] ; then
 			MASTERDEBS=""
 		fi
 		$UP2DATE || sudo apt-get update
-		$UP2DATE || [ -z "$PREDEBS" ] || sudo apt-get install $PREDEBS
 		$UP2DATE || sudo apt-get install $DEBS $MASTERDEBS
 		# for varying kernels:
 		# - we use bpo kernels on osuosl2 and ionos5+15 and infom02+08



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

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