[Git][qa/jenkins.debian.net][master] installation tests: refactoring

[Holger Levsen (@holger)]

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


Commits:
1d9b3e07 by Holger Levsen at 2025-08-21T21:00:36+02:00
installation tests: refactoring

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

- - - - -


1 changed file:

- bin/chroot-installation.sh


Changes:

=====================================
bin/chroot-installation.sh
=====================================
@@ -40,10 +40,6 @@ cleanup_all() {
 	fi
 }
 
-execute_ctmpfile() {
-	echo "echo xxxxxSUCCESSxxxxx" >> $CTMPFILE
-}
-
 prepare_bootstrap() {
 	cat >> $CTMPFILE <<-EOF
 $SCRIPT_HEADER
@@ -128,14 +124,12 @@ EOF
 
 bootstrap() {
 	prepare_bootstrap $1
-	execute_ctmpfile
 }
 
 install_packages() {
 	echo "Installing extra packages for $1 now."
 	shift
 	prepare_install_packages $@
-	execute_ctmpfile
 }
 
 install_binary_packages() {
@@ -143,7 +137,6 @@ install_binary_packages() {
 	shift
 	# install all binary packages build from these source packages
 	prepare_install_binary_packages $@
-	execute_ctmpfile
 }
 
 
@@ -151,13 +144,11 @@ install_build_depends() {
 	echo "Installing build depends for $1 now."
 	shift
 	prepare_install_build_depends $@
-	execute_ctmpfile
 }
 
 upgrade2() {
 	echo "Upgrading to $1 now."
 	prepare_upgrade2 $1
-	execute_ctmpfile
 }
 
 #
@@ -169,21 +160,16 @@ trap cleanup_all INT TERM EXIT
 #
 # bootstrap base system
 # 
-
-LXQT="lxqt"
-REPRO=""
 case $1 in
 	bookworm|trixie|forky|sid)
 			DISTRO="$1"
-			SPECIFIC="libreoffice virt-manager mpv chromium"
+			REPRO=""
+			FIREFOX="firefox-esr"
 			if [ "$DISTRO" != "bookworm" ] ; then
 				REPRO="debian-repro-status"
 			fi
 			if [ "$DISTRO" = "sid" ] ; then
 				FIREFOX="firefox firefox-esr"
-			else
-				FIREFOX="firefox-esr"
-			fi
 			;;
 	*)		echo "unsupported distro."
 			exit 1
@@ -193,10 +179,9 @@ bootstrap $DISTRO
 
 #
 # install packages
-
 #
 if [ "$2" != "" ] ; then
-	FULL_DESKTOP="$SPECIFIC desktop-base gnome kde-plasma-desktop kde-full kde-standard xfce4 lxde $LXQT vlc evince $FIREFOX cups build-essential devscripts wine texlive-full asciidoc vim emacs"
+	FULL_DESKTOP="desktop-base gnome kde-plasma-desktop kde-full kde-standard xfce4 lxde lxqt vlc evince $FIREFOX cups build-essential devscripts wine texlive-full asciidoc vim emacs libreoffice virt-manager mpv chromium"
 	case $2 in
 		none)		;;
 		gnome)		install_packages gnome $REPRO gnome desktop-base
@@ -244,7 +229,6 @@ fi
 #
 # upgrade to next distro
 #
-
 if [ "$3" != "" ] ; then
 	case $3 in
 		bookworm|trixie|forky|sid)	upgrade2 $3;;
@@ -254,13 +238,12 @@ fi
 
 #
 # the end
-
 #
 if [ -n "$REPRO" ] ; then
-	echo
-	echo Trying to run debian-repro-status:
-	echo "debian-repro-status > /dev/null || true" >> $CTMPFILE
-	echo
+	echo echo >> $CTMPFILE
+	echo echo Trying to run debian-repro-status: >> $CTMPFILE
+	echo "debian-repro-status -s || true" >> $CTMPFILE
+	echo echo >> $CTMPFILE
 fi
 
 chmod +x "$CTMPFILE"



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

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/1d9b3e072402a47a5174cde02b5f05e641e37a9e
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/20250821/0f33dc23/attachment-0001.htm>